From dfb8d75b356b8333ee77b7e3cb0000aee6a3151b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 31 Mar 2022 02:44:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AF=A6=E6=83=85(=E6=A0=91=E5=BD=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 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 7c3f651b8..bf5fd12de 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
@@ -578,6 +578,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         queryWrapper.eq(BussDocumentLibraryEO::getId, id);
         //字段属性
         List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList("1");
+        List<OnlCgformField> treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        List<String> treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         List<OnlCgformField> onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
         List<String> dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         //通过id查询数据
@@ -686,11 +688,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //                dataList.get(0).put("replace_standard_id", replaceStandard);
 //            }
 //        }
-        if (StringUtils.isNotBlank((String) dataList.get(0).get("technology_territory"))) {
-            String technologyTerritory = (String) dataList.get(0).get("technology_territory");
-            dataList.get(0).put("technology_territory", Arrays.asList(technologyTerritory.split(",")));
-        } else {
-            dataList.get(0).put("technology_territory", null);
+        for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
+            if(treeList.contains(entry.getKey())){
+                String value = (String) entry.getValue();
+                if(StringUtils.isNotBlank(value)){
+                    dataList.get(0).put(entry.getKey(), Arrays.asList(value.split(",")));
+                }else{
+                    dataList.get(0).put(entry.getKey(), null);
+                }
+            }
         }
         return dataList;
     }
@@ -1959,18 +1965,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         mapTemp.put("domainId", map.get("technology_territory"));
         mapTemp.put("documentId", map.get("id"));
         List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
-        //1.先判断是否订阅
-//        LambdaQueryWrapper<OnlCgformSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-//        lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String) map.get("id"));
-//        List<OnlCgformSubscribe> onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper);
-//        List<String> userNameList = new ArrayList<>();
-//        if (onlCgformSubscribeList.size() != 0) {
-//            for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) {
-//                userNameList.add(onlCgformSubscribe.getCreateBy());
-//            }
-//            List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ","));
-//            List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
-
         String id = (String) map.get("id");
         String title = (String) map.get("title");
         String href = "<a href='/docManage/library/detail?id=" + id +