diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java index d8c999b7c..a19793d55 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java @@ -53,7 +53,9 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.Dept; +import com.njcn.user.pojo.po.User; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; @@ -113,7 +115,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl querySuperviseList = thsSuperviseMapper.querySuperviseList(superviseDto); ThsSuperviseVo thsSuperviseVo = new ThsSuperviseVo(); if (CollectionUtil.isNotEmpty(querySuperviseList)) { + + List userIds = querySuperviseList.stream().filter(item->Objects.nonNull(item.getModifyUser())).map(SuperviseVo::getModifyUser).distinct().collect(Collectors.toList()); + + List userList = userFeignClient.getUserByIdList(userIds).getData(); + Map userMap = userList.stream().collect(Collectors.toMap(User::getId,Function.identity())); + + List deptIds = querySuperviseList.stream().map(SuperviseVo::getDeptId).distinct().collect(Collectors.toList()); + + List deptList = deptFeignClient.getDeptInfoListByIds(deptIds).getData(); + Map deptMap = deptList.stream().collect(Collectors.toMap(Dept::getId,Function.identity())); + for (SuperviseVo superviseVo : querySuperviseList) { - superviseVo.setCompanyName(deptFeignClient.getDeptById(superviseVo.getDeptId()).getData().getName()); + + superviseVo.setModifyUser(userMap.get(superviseVo.getModifyUser()).getName()); + + superviseVo.setCompanyName(deptMap.get(superviseVo.getDeptId()).getName()); //处理预警类型 Date modifyTime = superviseVo.getModifyTime();