Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into dev/neo2mysql20210120

cdssman-service/src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -1,17 +1,14 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.KlConceptStaticDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
-import com.diagbot.entity.User;
-import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.KlConceptStaticServiceImpl;
-import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ChangeStatusVO;
@@ -39,7 +36,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
     @Autowired
     private CdssCoreClient cdssCoreClient;
     @Autowired
-    private UserFacade userFacade;
+    private UserServiceClient userServiceClient;
 
     /**
      * 静态知识检索
@@ -91,28 +88,21 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
             page = respDTO.data;
         }
         List<KlConceptStaticDTO> records = page.getRecords();
-        List<Long> userIds = records.stream().map(KlConceptStaticDTO::getModifier)
+        List<String> userIds = records.stream().map(KlConceptStaticDTO::getModifier)
                 .distinct()
-                .map(Long::parseLong)
                 .collect(Collectors.toList());
-        List<User> users = userFacade.list(new QueryWrapper<User>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("id", userIds, false));
-        if (ListUtil.isNotEmpty(users)) {
-            Map<Long, String> userMap = users.stream().collect(Collectors.toMap(User::getId, User::getLinkman));
-            records.forEach(record -> {
-                if (userMap.containsKey(Long.valueOf(record.getModifier()))) {
-                    record.setModifier(userMap.get(Long.valueOf(record.getModifier())));
-                } else {
-                    record.setModifier("");
-                }
-            });
-
-        } else {
-            records.forEach(record -> {
-                record.setModifier("");
-            });
+        RespDTO<Map<String, String>> userRespDTO = userServiceClient.getUserInfoByIds(userIds);
+        if (RespDTOUtil.respIsNG(userRespDTO)) {
+            return page;
         }
+        Map<String, String> userMap = userRespDTO.data;
+        records.forEach(record -> {
+            if (userMap.containsKey(record.getModifier())) {
+                record.setModifier(userMap.get(record.getModifier()));
+            } else {
+                record.setModifier("");
+            }
+        });
         page.setRecords(records);
         return page;
     }