Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -218,6 +218,35 @@ public class CheckServiceImpl implements ICheckService {
             return new PageImpl<>(content, param, total);
         }
         content = checkMapper.getCheckInfoNew(param);
+
+        if (!CollectionUtils.isEmpty(content)) {
+            Set<String> userIds = Sets.newHashSet(Lists.transform(content, CheckInfoVo::getUserId));
+            Set<String> deptIds = Sets.newHashSet(Lists.transform(content, CheckInfoVo::getDepId));
+            deptIds.remove("");
+            deptIds.remove(null);
+            String joinUserId="";
+            for (String userId:userIds) {
+                if(!ObjectUtils.isEmpty(userId)){
+                    joinUserId=joinUserId+userId+",";
+                }
+            }
+            Map<String, String> deptMap =  new HashMap<String,String>();
+            Map<String, String> deptMapNew= deptMap;
+            List<String> userNames = new ArrayList<>();
+            content.forEach(e -> {
+                userNames.clear();
+                List<String> userIds1 = Arrays.asList(e.getUserId().split(","));
+                for(String userId : userIds1){
+                    FeignClientResult result = jcsFeignClient.selectById(userId);
+                    Object result1 = result.getResult();
+                    String personName = ((Map<String, Object>) result1).get("personName").toString();
+                    userNames.add(personName);
+                }
+                userNames.remove(null);
+                e.setUserName(Joiner.on(",").join(userNames));
+            });
+        }
+
         return new PageImpl<>(content, param, total);
     }