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

icssman-service/src/main/java/com/diagbot/facade/QuestionInfoFacade.java

@@ -3,8 +3,10 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.QuestionPageDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.CommonParam;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.QuestionDetail;
@@ -68,6 +70,8 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
     DeptInfoFacade deptInfoFacade;
+    @Autowired
+    UserServiceClient userServiceClient;
 
 
     /**
@@ -292,9 +296,18 @@ public class QuestionInfoFacade extends QuestionInfoServiceImpl {
      * @return
      */
     public IPage<QuestionPageDTO> getListFac(QuestionPageVO questionPageVO) {
-
         IPage<QuestionPageDTO> res = this.getList(questionPageVO);
-        //        List<QuestionPageDTO> data = res.getRecords();
+        if (res.getTotal() <= 0) {
+            return res;
+        }
+        List<String> personIds = res.getRecords().stream().map(row -> row.getModifier()).collect(Collectors.toList());
+        RespDTO<Map<String, String>> mapRespDTO = userServiceClient.getUserInfoByIds(personIds);
+        if (mapRespDTO == null || !"0".equals(mapRespDTO.code)) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, "获取操作人失败");
+        }
+        for (QuestionPageDTO bean : res.getRecords()) {
+            bean.setModifier(mapRespDTO.data.get(bean.getModifier()));
+        }
         return res;
     }