fix委计划排期、拆解工单传感器数组、设备id数组为空判断

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/dto/ItdmJHYAddOrUpdateDTO.java

@@ -147,7 +147,7 @@ public class ItdmJHYAddOrUpdateDTO {
                 else chuanganqi = chuanganqi + ","+ arr[i];
             }
             itdmTestPlan.setChuanganqi(chuanganqi);
-        }
+        }else itdmTestPlan.setChuanganqi("");
 
         if(vo.getShebeiIdArray()!=null && vo.getShebeiIdArray().length>0){
             String[] arr = vo.getShebeiIdArray();
@@ -157,7 +157,7 @@ public class ItdmJHYAddOrUpdateDTO {
                 else shebeiId = shebeiId + ","+ arr[i];
             }
             itdmTestPlan.setShebeiId(shebeiId);
-        }
+        }else itdmTestPlan.setShebeiId("");
 
         return  itdmTestPlan;
     }
@@ -182,12 +182,12 @@ public class ItdmJHYAddOrUpdateDTO {
                 else chuanganqi = chuanganqi + ","+ arr[i];
             }
             m.setChuanganqi(chuanganqi);
-        }
+        }else m.setChuanganqi("");
 
         if(vo.getShebeiIdArray() != null && vo.getShebeiIdArray().length>0){
             String[] arr = vo.getShebeiIdArray();
             m.setShebeiId(arr[0]);
-        }
+        }else m.setShebeiId("");
 
         return m;
     }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/dto/ItdmXMJLAddOrUpdateDTO.java

@@ -152,23 +152,28 @@ public class ItdmXMJLAddOrUpdateDTO {
         m.setShijiStartDate(vo.getShijiStartDate());//如果用于新增，为空
         m.setNeirong(vo.getNeirong());
 
-        String[] arr = vo.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
-        }
-        m.setChuanganqi(chuanganqi);
-
-        String[] shiyanTypeArr = vo.getShiiyanTypeArray();
-        String shiyanType = "";
-        if (shiyanTypeArr != null && shiyanTypeArr.length > 0) {
-            for (int i = 0; i < shiyanTypeArr.length; i++) {
-                if(i==0) shiyanType = shiyanTypeArr[i];
-                else shiyanType = shiyanType + ","+ shiyanTypeArr[i];
+        if(vo.getChuanganqiArray()!=null && vo.getChuanganqiArray().length>0){
+            String[] arr = vo.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
             }
-        }
-        m.setShiiyanType(shiyanType);
+            m.setChuanganqi(chuanganqi);
+        }else m.setChuanganqi("");
+
+        if(vo.getShiiyanTypeArray()!=null && vo.getShiiyanTypeArray().length>0){
+            String[] shiyanTypeArr = vo.getShiiyanTypeArray();
+            String shiyanType = "";
+            if (shiyanTypeArr != null && shiyanTypeArr.length > 0) {
+                for (int i = 0; i < shiyanTypeArr.length; i++) {
+                    if(i==0) shiyanType = shiyanTypeArr[i];
+                    else shiyanType = shiyanType + ","+ shiyanTypeArr[i];
+                }
+            }
+            m.setShiiyanType(shiyanType);
+        }else m.setShiiyanType("");
+
         return m;
     }
 
@@ -191,13 +196,16 @@ public class ItdmXMJLAddOrUpdateDTO {
         itdmTestPlan.setChuanganqi(vo.getChuanganqi());
         itdmTestPlan.setStatus(vo.getStatus());
 
-        String[] arr = vo.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
-        }
-        itdmTestPlan.setChuanganqi(chuanganqi);
+        if(vo.getChuanganqiArray()!=null && vo.getChuanganqiArray().length>0){
+            String[] arr = vo.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
+            }
+            itdmTestPlan.setChuanganqi(chuanganqi);
+        }else itdmTestPlan.setChuanganqi("");
+
 
         return  itdmTestPlan;
     }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -120,13 +120,16 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     public String XMJLAddOrUpdate(ItdmXMJLAddOrUpdateDTO dto){
         String msg = "操作成功！";
 
-        String[] arr = dto.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
-        }
-        dto.setChuanganqi(chuanganqi);
+        if(dto.getChuanganqiArray()!=null && dto.getChuanganqiArray().length>0){
+            String[] arr = dto.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
+            }
+            dto.setChuanganqi(chuanganqi);
+        }else dto.setChuanganqi("");
+
 
         if(dto.getParent()!=null){ //二级，先根据id查询工单master，判断有无该对象存在，无的话为新增，有的话修改(项目经理不可修改一级)
             ItdmGongdanMaster gongdanMaster = itdmGongdanMasterMapper.selectById(dto.getId());