打印机类型显示问题修改

web/src/main/java/com/jpsoft/railroad/modules/form/controller/PrinterMaintenanceInfoController.java

@@ -183,7 +183,12 @@ public class PrinterMaintenanceInfoController {
 
                 String name = dataDictionaryService.findNameByCatalogNameAndValue("打印机类型", printerMaintenanceInfo.getDeviceType());
 
-                printerMaintenanceInfo.setDeviceTypeName(name);
+                if(StringUtils.isNotEmpty(name)){
+                    printerMaintenanceInfo.setDeviceTypeName(name);
+                }
+                else{
+                    printerMaintenanceInfo.setDeviceTypeName(printerMaintenanceInfo.getDeviceType());
+                }
 
                 printerMaintenanceInfo.setAnnexFileList(annexFileList);
 
@@ -381,7 +386,14 @@ public class PrinterMaintenanceInfoController {
 
             String name = dataDictionaryService.findNameByCatalogNameAndValue("打印机类型", printerMaintenanceInfo.getDeviceType());
 
-            printerMaintenanceInfo.setDeviceTypeName(name);
+            if(StringUtils.isNotEmpty(name)){
+                printerMaintenanceInfo.setDeviceTypeName(name);
+            }
+            else{
+                printerMaintenanceInfo.setDeviceTypeName(printerMaintenanceInfo.getDeviceType());
+            }
+
+
         }