1.代码错误return 导致后续代码不执行bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EqEqDynamicFormServiceImpl.java

@@ -147,20 +147,16 @@ public class EqEqDynamicFormServiceImpl implements IEqDynamicFormService {
         //3.处理子分组数据
         List<DynamicFormGroup> groupList = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
                 .eq(DynamicFormGroup::getParentId, dynamicFormGroupVo.getId()).eq(DynamicFormGroup::getParentId, dynamicFormGroupVo.getId()).orderByAsc(DynamicFormGroup::getSort));
-        List<DynamicFormGroupVo> formGroupVos=new ArrayList<>();
-        List<DynamicFormGroupVo> formGroupVos1 = groupList.stream().map(s -> {
+        List<DynamicFormGroupVo> formGroupVos = new ArrayList<>();
+        groupList.forEach(s -> {
             this.stringToJsonGroupConfig(s);
             JSONObject jsonObject =s.getGroupConfig();
-            if((jsonObject.get("isSelect").toString()).equals("true")){
+            if(jsonObject.get("isSelect") != null && "true".equals(jsonObject.get("isSelect").toString())){
                 DynamicFormGroupVo target = new DynamicFormGroupVo();
                 Bean.copyExistPropertis(s, target);
                 formGroupVos.add(target);
-                return target;
             }
-
-            return null;
-
-        }).collect(Collectors.toList());
+        });
         formGroupVos.forEach(v -> {
             this.fillFormColumnWithFiledValue(v, formInstanceMap);
             buildGroupsAndColumnsTreeWithValue(v, dynamicFormInstances);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -226,8 +226,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             // AST数据同步
             List<FireFightingSystem> fireFightingSystemDetail = getFireFightingSystemDetail(vo);
             syncDataService.syncCreatedFireFightingSystem(fireFightingSystemDetail);
-        } else {
-            return s;
         }
         // 3.保存图片数据
         this.insertFiles(vo);
@@ -241,8 +239,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
         // 验证必填项 BUG 2725 by kongfm 2021-09-09
         List<DynamicFormInstance> formInstance = vo.getFormInstances();
-        formInstance.stream().forEach(item -> {
-            if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
+        formInstance.forEach(item -> {
+            if (item.getNotNull() && StringUtils.isEmpty(item.getFieldValue())) {
                 throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
             }
         });
@@ -262,8 +260,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             // AST数据同步
             List<FireFightingSystem> fireFightingSystemDetail = getFireFightingSystemDetail(vo);
             syncDataService.syncCreatedFireFightingSystem(fireFightingSystemDetail);
-        } else {
-            return null;
         }
         // 1.更新消防系统数据
         String sequenceNbr = vo.getId();