Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r35937 -r35968
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 35937)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 35968)
@@ -2634,9 +2634,25 @@
     if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){
         if(sessionStorage.getItem('clientComputerPrinters')){
             var clientComputerPrinters = eval('('+sessionStorage.getItem('clientComputerPrinters')+')');
-            if (clientComputerPrinters[type] != undefined) {
-                printerName = clientComputerPrinters[type];
+            var name = '';
+            if(type == 'smallLabel'){
+                name = '小标签';
+            }else if(type == 'smallLabel2'){
+                name = '小标签2';
+            }else if(type == 'middleLable'){
+                name = '中标签';
+            }else if(type == 'middleLable2'){
+                name = '中标签2';
+            }else if(type == 'largeLabel'){
+                name = '大标签';
+            }else if(type == 'largeLabel2'){
+                name = '大标签2';
+            }else if(type == 'exLargeLabel'){
+                name = '加大标签';
             }
+            if (clientComputerPrinters[name] != undefined) {
+                printerName = clientComputerPrinters[name];
+            }
         }
         return printerName;
     }else {
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r35937 -r35968
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 35937)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 35968)
@@ -328,15 +328,21 @@
 				success : function(response, options) {
 					var result = Ext4.decode(response.responseText, true);
 					if(result.success){
-						var labelPrinterSettings = result.data[0].labelPrinterSettings;
-						if(labelPrinterSettings.length > 0){
-							var printerMap = {};
-							for(var i=0;i<labelPrinterSettings.length;i++){
-								var labelName = labelPrinterSettings[i].labelName;
-								var printerName = labelPrinterSettings[i].printerName;
-								printerMap[labelName] = printerName;
+						if(result.data.length > 0){
+							var labelPrinterSettings = result.data[0].labelPrinterSettings;
+							if(labelPrinterSettings.length > 0){
+								var printerMap = {};
+								for(var i=0;i<labelPrinterSettings.length;i++){
+									var labelName = labelPrinterSettings[i].labelName;
+									var printerName = labelPrinterSettings[i].printerName;
+									printerMap[labelName] = printerName;
+								}
+								sessionStorage.setItem('clientComputerPrinters',JSON.stringify(printerMap))
+							}else {
+								sessionStorage.setItem('clientComputerPrinters',null);
 							}
-							sessionStorage.setItem('clientComputerPrinters',JSON.stringify(printerMap))
+						}else {
+							sessionStorage.setItem('clientComputerPrinters',null);
 						}
 					}
 				}