Browse Source

fix设备下拉列表重要性标准非空判断

LLL 1 year ago
parent
commit
8c6a253285

+ 5 - 3
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDevice/controller/ItdmDeviceController.java

@@ -53,9 +53,11 @@ public class ItdmDeviceController extends JeecgController<ItdmDevice, IItdmDevic
 		 List<ItdmDevice> list = itdmDeviceService.queryList();
 		 List<ItdmDeviceXLListVO> list1 = list.stream().map(i->{
 		 	String zyxbzText ="";
-		 	if(i.getZyxbz()==0) zyxbzText ="气候试验";
-		 	else if(i.getZyxbz()==1) zyxbzText ="力学试验";
-		 	else if(i.getZyxbz()==2) zyxbzText ="重要试验";
+		 	if(i.getZyxbz()!=null){
+				if(i.getZyxbz()==0) zyxbzText ="气候试验";
+				else if(i.getZyxbz()==1) zyxbzText ="力学试验";
+				else if(i.getZyxbz()==2) zyxbzText ="重要试验";
+			}
 			return ItdmDeviceConvert1.INSTANCE.convert(i,zyxbzText);
 		 }).collect(Collectors.toList());
 		 return list1;