BUG 修改

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringIndustryBo.java

@@ -23,73 +23,61 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     /**
      *
      */
-    @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
 
     /**
      * 工程类型
      */
-    @NotBlank(message = "工程类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginType;
 
     /**
      * 建筑单位
      */
-    @NotBlank(message = "建筑单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String constructUnit;
 
     /**
      * 项目负责人
      */
-    @NotBlank(message = "项目负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String projectHead;
 
     /**
      * 现场负责人
      */
-    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sceneHead;
 
     /**
      * 设计单位
      */
-    @NotBlank(message = "设计单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String designUnit;
 
     /**
      * 设计负责人
      */
-    @NotBlank(message = "设计负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String designHead;
 
     /**
      * 设计联系电话
      */
-    @NotBlank(message = "设计联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String designPhone;
 
     /**
      * 监理单位
      */
-    @NotBlank(message = "监理单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionUnit;
 
     /**
      * 监理负责人
      */
-    @NotBlank(message = "监理负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionHead;
 
     /**
      * 监理联系电话
      */
-    @NotBlank(message = "监理联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supervisionPhone;
 
     /**
      * 工程名称
      */
-    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String enginName;
 
     /**
@@ -100,7 +88,6 @@ public class ZEngineeringIndustryBo extends BaseEntity {
     /**
      * 类型(工业工程|市政工程)
      */
-    @NotBlank(message = "类型(工业工程|市政工程)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     private ZEngineeringNodeBo zEngineeringNodeBo;

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -246,9 +246,11 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 }
             }
         }
-        List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
-        if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
-            nodeService.updateMuch(bo.getzEngineeringNodeBo());
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
+            List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
+            if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
+                nodeService.updateMuch(bo.getzEngineeringNodeBo());
+            }
         }
         //        bo.getzEngineeringNodeBoList().stream().forEach(item->{
         //            item.setCivliId(bo.getId());