解决运维管理--巡检管理--巡检项新增其他类型报错问题

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/entity/CmmsInspectItem.java

@@ -92,7 +92,7 @@ public class CmmsInspectItem implements Serializable {
     /** 分类 */
     @Excel(name = "分类", width = 15)
     @ApiModelProperty(value = "分类")
-    @Dict(dicCode = "item_type")
+    @Dict(dicCode = "inspect_item_type")
     private java.lang.String classification;
 
 

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectItem/service/impl/CmmsInspectItemServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsInspectItem.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItem;
 import org.jeecg.modules.cmmsInspectItem.entity.CmmsInspectItemVo;
@@ -45,35 +46,42 @@ public class CmmsInspectItemServiceImpl extends ServiceImpl<CmmsInspectItemMappe
 
         String equipdefid = cmmsInspectItem.getEquipdefid();
 
-        String[] equipdefids = equipdefid.split(",");
-        List<String> strings = Arrays.asList(equipdefids);
-        for (String str:strings) {
-            CmmsInspectItem item = new CmmsInspectItem();
-            item.setEquipdefid(str);
-            if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
-                item.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));
-            }else {
-                item.setItemcode(cmmsInspectItem.getItemcode());
-            }
-            if (cmmsInspectItem.getClassification() != null){
-                item.setClassification(cmmsInspectItem.getClassification());
-            }
-            if (cmmsInspectItem.getConditions() != null){
-                item.setConditions(cmmsInspectItem.getConditions());
-            }
-            if (cmmsInspectItem.getItemname() != null){
-                item.setItemname(cmmsInspectItem.getItemname());
+        if(ObjectUtil.isNotNull(cmmsInspectItem.getEquipdefid())){
+            String[] equipdefids = equipdefid.split(",");
+            List<String> strings = Arrays.asList(equipdefids);
+            for (String str:strings) {
+                CmmsInspectItem item = new CmmsInspectItem();
+                item.setEquipdefid(str);
+                if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
+                    item.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));
+                }else {
+                    item.setItemcode(cmmsInspectItem.getItemcode());
+                }
+                if (cmmsInspectItem.getClassification() != null){
+                    item.setClassification(cmmsInspectItem.getClassification());
+                }
+                if (cmmsInspectItem.getConditions() != null){
+                    item.setConditions(cmmsInspectItem.getConditions());
+                }
+                if (cmmsInspectItem.getItemname() != null){
+                    item.setItemname(cmmsInspectItem.getItemname());
+                }
+                if (cmmsInspectItem.getInspectionstandards() != null){
+                    item.setInspectionstandards(cmmsInspectItem.getInspectionstandards());
+                }
+                if (cmmsInspectItem.getTag() != null){
+                    item.setTag(cmmsInspectItem.getTag());
+                }
+                if (cmmsInspectItem.getRemark() != null){
+                    item.setRemark(cmmsInspectItem.getRemark());
+                }
+                list.add(item);
             }
-            if (cmmsInspectItem.getInspectionstandards() != null){
-                item.setInspectionstandards(cmmsInspectItem.getInspectionstandards());
-            }
-            if (cmmsInspectItem.getTag() != null){
-                item.setTag(cmmsInspectItem.getTag());
-            }
-            if (cmmsInspectItem.getRemark() != null){
-                item.setRemark(cmmsInspectItem.getRemark());
+        }else {
+            if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
+                cmmsInspectItem.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));
             }
-            list.add(item);
+            list.add(cmmsInspectItem);
         }
         //if (cmmsInspectItem.getItemcode() == null || "".equals(cmmsInspectItem.getItemcode())){
         //    cmmsInspectItem.setItemcode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTITEM_CODE, null));