店长/店员 任务列表判空

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

@@ -174,12 +174,16 @@ public class CanvasDataController {
             Set<String> clerkIdList = list.stream().filter(e -> StringUtils.isNotBlank(e.getClerkId())).map(e -> e.getClerkId()).collect(Collectors.toSet());
             if (CollectionUtils.isNotEmpty(clerkIdList)) {
                 List<ClerkDTO> clerkList = clerkService.getClerkByClerkIds(clerkIdList);
-                Map<String, String> clerkIdMapHeadImage = clerkList.stream().collect(Collectors.toMap(e -> e.getClerkId(), e -> e.getHeadImgUrl()));
+                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()));
                     for (CanvasStoreTaskVO vo : list) {
                         vo.setClerkImageUrl(clerkIdMapHeadImage.get(vo.getClerkId()));
                     }
                 }
             }
+        }
         return RestResponse.successResult(page);
     }