修改bug

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

@@ -146,12 +146,20 @@ public class EqEqDynamicFormServiceImpl implements IEqDynamicFormService {
         this.fillFormColumnWithFiledValue(dynamicFormGroupVo, formInstanceMap);
         //3.处理子分组数据
         List<DynamicFormGroup> groupList = iEqDynamicFormGroupService.list(new LambdaQueryWrapper<DynamicFormGroup>()
-                .eq(DynamicFormGroup::getParentId, dynamicFormGroupVo.getId()).orderByAsc(DynamicFormGroup::getSort));
-        List<DynamicFormGroupVo> formGroupVos = groupList.stream().map(s -> {
+                .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 -> {
             this.stringToJsonGroupConfig(s);
-            DynamicFormGroupVo target = new DynamicFormGroupVo();
-            Bean.copyExistPropertis(s, target);
-            return target;
+            JSONObject jsonObject =s.getGroupConfig();
+            if((jsonObject.get("isSelect").toString()).equals("true")){
+                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);