diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java index 3d3870f77..1425ad344 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategoryTreeVO.java @@ -13,6 +13,8 @@ public class SysCategoryTreeVO { private String id; + private String key; + private String parentId; private String title; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java index c577bff78..8bb6a79d0 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java @@ -25,6 +25,7 @@ public class TreeUtils { if (TREE_ROOT_CODE.equals(sysCategory.getPid())) { SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO(); sysCategoryTreeVO.setId(sysCategory.getId()); + sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); sysCategoryTreeVO.setTitle(sysCategory.getName()); sysCategoryTreeVO.setParentId(sysCategory.getPid()); @@ -42,6 +43,7 @@ public class TreeUtils { SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO(); sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); sysCategoryTreeVO.setId(sysCategory.getId()); + sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setTitle(sysCategory.getName()); sysCategoryTreeVO.setParentId(sysCategory.getPid()); sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 6715dcd23..fff99d211 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -289,15 +289,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); for (OnlCgformField onlCgformField : fieldListTemp) { String dictId = onlCgformField.getDictId(); - SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO(); + List sysCategoryTreeVOList = new ArrayList<>(); if(StringUtils.isNotBlank(dictId)){ - List sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> dictId.equals(e.getDictId())).collect(Collectors.toList()); - if(sysCategoryTreeVOList.size() != 0){ - sysCategoryTreeVO = sysCategoryTreeVOList.get(0); - } + sysCategoryTreeVOList = sysCategoryTree.stream().filter(e -> dictId.equals(e.getDictId())).collect(Collectors.toList()); } Map map = new HashMap<>(); - mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName,sysCategoryTreeVO); + mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName,sysCategoryTreeVOList); map.put("field_must_input", onlCgformField.getFieldMustInput());//区域 result.add(map); } @@ -548,7 +545,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTreeVOS) { map.put(field_show_type, fieldShowType2);//类型(判断是下拉还是输入框,等等) map.put(dict_field, dictField); map.put(db_field_name, dbFieldName2);//字段 @@ -562,7 +559,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl