From 17e72b521195ee4b3154a7f3feaf694662475737 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 22 Mar 2022 17:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?,=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9(=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E9=A2=86=E5=9F=9F=E6=90=9C=E7=B4=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

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