From e3967f69a73f181b70903eabf1558d4d4701dbd9 Mon Sep 17 00:00:00 2001 From: guosongrui <17737810342@163.com> Date: Fri, 24 May 2024 16:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8D=A2=E6=88=90=E5=BD=93=E5=89=8D=E4=BA=BA?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupervisionDevMainReportPOServiceImpl.java | 5 ++++- .../SupervisionTempLineDebugPOServiceImpl.java | 14 ++++++++++---- .../impl/SupervisionTempLineReportServiceImpl.java | 5 +++-- .../SupervisionUserComplaintPOServiceImpl.java | 2 -- .../SupervisionGeneralSurveyPlanPOServiceImpl.java | 5 ++++- .../user/impl/UserReportNormalServiceImpl.java | 8 +++----- .../service/user/impl/UserReportPOServiceImpl.java | 10 ++++++++-- 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 6e225dabb..782a8dd92 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -120,7 +120,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); String userIndex = RequestUtil.getUserIndex(); - queryWrapper.in("supervision_dev_main_report.create_by", CollectionUtil.newArrayList(userIndex)) + //获取当前用户部门所有同事的id，查看该部门下所有的数据 + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + + queryWrapper.in("supervision_dev_main_report.create_by", colleaguesIds) .eq("supervision_dev_main_report.state", DataStateEnum.ENABLE.getCode()); if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgNo())) { /*获取直接下属子单位*/ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index c33388a61..9576e18a5 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -20,6 +20,7 @@ import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO; import com.njcn.supervision.service.device.SupervisionTempLineDebugPOService; import com.njcn.supervision.service.device.SupervisionTempLineReportService; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.api.UserFeignClient; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; @@ -49,6 +50,8 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); - String userIndex = RequestUtil.getUserIndex(); - queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex)) + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + + + queryWrapper.in("supervision_temp_line_report.create_by", colleaguesIds) .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()); if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) { /*获取直接下属子单位*/ @@ -109,8 +114,9 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); - String userIndex = RequestUtil.getUserIndex(); - queryWrapper + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + + queryWrapper.in("supervision_temp_line_debug.Create_By", colleaguesIds) .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode()); if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) { /*获取直接下属子单位*/ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java index c311e091e..e99cd3ee2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java @@ -91,9 +91,10 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); - String userIndex = RequestUtil.getUserIndex(); + //获取当前用户部门所有同事的id，查看该部门下所有的数据 + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - queryWrapper.in("supervision_temp_line_report.create_by", CollectionUtil.newArrayList(userIndex)) + queryWrapper.in("supervision_temp_line_report.create_by", colleaguesIds) .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()) .in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()),"supervision_temp_line_report.status",supervisionTempLineReportQuery.getStatueList()); if (StrUtil.isNotBlank(supervisionTempLineReportQuery.getOrgNo())) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java index 62e64127b..7456e3b02 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java @@ -69,7 +69,6 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl page = this.baseMapper.getPage(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); - return page; } @@ -96,7 +95,6 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl getSurvey(SupervisionGeneralSurveyPlanParm.GeneralSurveyPlanQueryParam generalSurveyPlanQueryParam) { String userIndex = RequestUtil.getUserIndex(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("supervision_general_survey_plan.create_by", CollectionUtil.newArrayList(userIndex)) + + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + + queryWrapper.in("supervision_general_survey_plan.create_by", colleaguesIds) .eq("supervision_general_survey_plan.state", DataStateEnum.ENABLE.getCode()); /*获取直接下属子单位*/ List data = deptFeignClient.getDepSonIdtByDeptId(generalSurveyPlanQueryParam.getOrgNo()).getData(); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java index f729a4ba1..02daaaa26 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java @@ -95,17 +95,15 @@ public class UserReportNormalServiceImpl extends ServiceImpl pageResult = new Page<>(); - List deptIds = deptFeignClient.getDepSonIdtByDeptId(RequestUtil.getDeptIndex()).getData(); - List userList = userFeignClient.getUserInfoByDeptIds(deptIds).getData(); - List userIds = userList.stream().map(User::getId).distinct().collect(Collectors.toList()); - if(CollUtil.isEmpty(userIds)){ + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + if(CollUtil.isEmpty(colleaguesIds)){ return pageResult; } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.orderByDesc(UserReportNormalPO::getCreateTime) .eq(UserReportNormalPO::getType,userReportNormalParam.getType()) - .in(UserReportNormalPO::getCreateBy, userIds) + .in(UserReportNormalPO::getCreateBy, colleaguesIds) .eq(UserReportNormalPO::getUserReportId,userReportNormalParam.getUserReportId()); Page page = this.page(new Page<>(PageFactory.getPageNum(userReportNormalParam), PageFactory.getPageSize(userReportNormalParam)), lambdaQueryWrapper); if (CollUtil.isNotEmpty(page.getRecords())) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 6b2ac8f73..81af55177 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -164,7 +164,10 @@ public class UserReportPOServiceImpl extends ServiceImpl getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) { String userIndex = RequestUtil.getUserIndex(); QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); - userReportVOQueryWrapper.in("supervision_user_report.create_by", CollectionUtil.newArrayList(userIndex)) + + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + + userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds) .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()); if (Objects.nonNull(userReportQueryParam)) { if (StrUtil.isNotBlank(userReportQueryParam.getCity())) { @@ -263,7 +266,10 @@ public class UserReportPOServiceImpl extends ServiceImpl getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam) { QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); - userReportVOQueryWrapper + + List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); + + userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds) .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_user_report.status",FlowStatusEnum.APPROVE.getCode()) ;