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 8361623b9..f60f069fe 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 @@ -1599,10 +1599,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); String valueStr = (String) value; - lambdaQueryWrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(valueStr.split(","))); - List> mapList = this.listMaps(lambdaQueryWrapper); + List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(valueStr); List serialNumberList = new ArrayList<>(); for (Map stringObjectMap : mapList) { serialNumberList.add((String) stringObjectMap.get("serial_number")); @@ -1702,9 +1700,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl documentIdList) { - LambdaQueryWrapper lambdaQueryWrapperTemp = new LambdaQueryWrapper<>(); - lambdaQueryWrapperTemp.in(BussDocumentLibraryEO::getId, documentIdList); - List> mapList = this.listMaps(lambdaQueryWrapperTemp); + List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(documentIdList,",")); List userNameListTemp = new ArrayList<>(); List serialNumberList = new ArrayList<>(); StringBuilder sb = new StringBuilder(); @@ -1795,6 +1791,16 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); + //需要查询的字段 + List fieldList = onlCgformFieldService.getFieldList("1"); + + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); //下拉选处理数据字典 @@ -1802,6 +1808,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl record1 = (Map) record; for (Map.Entry entry : record1.entrySet()) { + treeDictItem(categoryList, entry, treeFieldList, (String) parameter.get("cut")); if ("state".equals(entry.getKey())) { //状态数据字典 List stateList = sysDictItems.stream() @@ -2849,9 +2856,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(documentIds.split(","))); - List> mapList = this.listMaps(lambdaQueryWrapper); + List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(documentIds); List serialNumberList = new ArrayList<>(); for (Map map : mapList) { serialNumberList.add((String) map.get("serial_number")); @@ -3041,7 +3046,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); //表头 - List> addForm = getAddForm(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add"); + List> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add"); exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName); //删除原上传文件 FileUnZip.deleteDir(saveDirectory);