fix: 修正店长/店员 任务列表头像

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

@@ -6,7 +6,9 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DataApiUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.web.qo.canvas.*;
 import com.gic.haoban.manage.web.utils.EsMemberInfoUtils;
 import com.gic.haoban.manage.web.vo.canvas.*;
@@ -38,6 +40,8 @@ public class CanvasDataController {
     private StaffApiService staffApiService;
     @Autowired
     private ClerkService clerkService;
+    @Autowired
+    private StaffClerkRelationApiService staffClerkRelationApiService;
 
     /**
      * 活动转化数据
@@ -192,13 +196,13 @@ public class CanvasDataController {
         Page<CanvasStoreTaskVO> page = DataApiUtils.getPageData(res, CanvasStoreTaskVO.class);
         List<CanvasStoreTaskVO> list = page.getResult();
         if (CollectionUtils.isNotEmpty(list)) {
-            Set<String> clerkIdList = list.stream().filter(e -> StringUtils.isNotBlank(e.getClerkId())).map(e -> e.getClerkId()).collect(Collectors.toSet());
+            List<String> clerkIdList = list.stream().filter(e -> StringUtils.isNotBlank(e.getClerkId())).map(e -> e.getClerkId()).distinct().collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(clerkIdList)) {
-                List<ClerkDTO> clerkList = clerkService.getClerkByClerkIds(clerkIdList);
-                if (CollectionUtils.isNotEmpty(clerkList)) {
-                    Map<String, String> clerkIdMapHeadImage = clerkList.stream()
-                            .filter(e -> StringUtils.isNotBlank(e.getHeadImgUrl()))
-                            .collect(Collectors.toMap(e -> e.getClerkId(), e -> e.getHeadImgUrl()));
+                List<StaffClerkRelationDTO> staffClerkRelationDTOS = staffClerkRelationApiService.listByClerkIds(clerkIdList);
+                if (CollectionUtils.isNotEmpty(staffClerkRelationDTOS)) {
+                    Map<String, String> clerkIdMapHeadImage = staffClerkRelationDTOS.stream()
+                            .filter(e -> StringUtils.isNotBlank(e.getStaffHeadImg()))
+                            .collect(Collectors.toMap(e -> e.getClerkId(), e -> e.getStaffHeadImg()));
                     for (CanvasStoreTaskVO vo : list) {
                         vo.setClerkImageUrl(clerkIdMapHeadImage.get(vo.getClerkId()));
                     }