Merge branch 'bug-fix/erqian' into 'master'

Bug fix/erqian

See merge request !2620

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/CanvasDataController.java

 package com.gic.haoban.manage.web.controller.data;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -131,6 +132,24 @@ public class CanvasDataController {
         List<CanvasConversionMemberVO> list = page.getResult();
         esMemberInfoUtils.setMemberInfo(qo.getEnterpriseId(), list, Stream.of("clerkCode", "clerkName")
                 .collect(Collectors.toSet()));
+        if (CollectionUtils.isNotEmpty(list)) {
+            Set<String> clerkIds = list.stream().map(CanvasConversionMemberVO::getClerkId).collect(Collectors.toSet());
+            if (CollUtil.isNotEmpty(clerkIds)) {
+                List<ClerkDTO> clerkList = clerkService.getClerkByClerkIds(clerkIds);
+                if (CollUtil.isNotEmpty(clerkList)) {
+                    Map<String, ClerkDTO> map = clerkList.stream()
+                            .collect(Collectors.toMap(ClerkDTO::getClerkId, dto -> dto, (k1, k2) -> k1));
+                    for (CanvasConversionMemberVO memberVO : list) {
+                        if (!map.containsKey(memberVO.getClerkId())) {
+                            continue;
+                        }
+                        memberVO.setClerkCode(map.get(memberVO.getClerkId()).getClerkCode());
+                        memberVO.setClerkName(map.get(memberVO.getClerkId()).getClerkName());
+                    }
+                }
+            }
+        }
+
         return RestResponse.successResult(page);
     }