分页查询查询当前用户条件统一换成当前人部门下的所有人

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -120,7 +120,10 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
         String userIndex = RequestUtil.getUserIndex();
 
-        queryWrapper.in("supervision_dev_main_report.create_by", CollectionUtil.newArrayList(userIndex))
+        //获取当前用户部门所有同事的id，查看该部门下所有的数据
+        List<String> 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())) {
             /*获取直接下属子单位*/

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<Supervisi
 
     private final SupervisionTempLineReportService supervisionTempLineReportService;
 
+    private final UserFeignClient userFeignClient;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String addTempLineDebug(SupervisionTempLineDebugParam supervisionTempLineReportParam) {
@@ -85,8 +88,10 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     public Page<SupervisionTempLineDebugVO> getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) {
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
 
-        String userIndex = RequestUtil.getUserIndex();
+        List<String> 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());
         if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
             /*获取直接下属子单位*/
@@ -109,8 +114,9 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     public Page<SupervisionTempLineDebugVO> pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) {
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
 
-        String userIndex = RequestUtil.getUserIndex();
+        List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
-        queryWrapper
+
+        queryWrapper.in("supervision_temp_line_debug.Create_By", colleaguesIds)
                 .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode());
         if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) {
             /*获取直接下属子单位*/

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java

@@ -91,9 +91,10 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     public Page<SupervisionTempLineReportVO> getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery) {
         QueryWrapper<SupervisionTempLineReport> queryWrapper = new QueryWrapper<>();
 
-        String userIndex = RequestUtil.getUserIndex();
+        //获取当前用户部门所有同事的id，查看该部门下所有的数据
+        List<String> 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())) {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java

@@ -69,7 +69,6 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<Supervisi
                 .eq("supervision_user_complaint.state",DataStateEnum.ENABLE.getCode())
                 .orderByDesc("supervision_user_complaint.Update_Time");
         Page<SupervisionUserComplaintVO> page = this.baseMapper.getPage(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper);
-
         return page;
     }
 
@@ -96,7 +95,6 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<Supervisi
                 complainteDetail
         );
         this.lambdaUpdate().eq(SupervisionUserComplaintPO::getId,id).set(SupervisionUserComplaintPO::getInitiateWarningFlag,1).update();
-
     }
 
     private String assembleComplainteDetail(SupervisionUserComplaintPO byId) {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java

@@ -206,7 +206,10 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl<Super
     public Page<SupervisionGeneralSurveyPlanVO> getSurvey(SupervisionGeneralSurveyPlanParm.GeneralSurveyPlanQueryParam generalSurveyPlanQueryParam) {
         String userIndex = RequestUtil.getUserIndex();
         QueryWrapper<SupervisionGeneralSurveyPlanVO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("supervision_general_survey_plan.create_by", CollectionUtil.newArrayList(userIndex))
+
+        List<String> 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<String> data = deptFeignClient.getDepSonIdtByDeptId(generalSurveyPlanQueryParam.getOrgNo()).getData();

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java

@@ -95,17 +95,15 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         Page<UserReportVO.UserReportGoNetVO> pageResult = new Page<>();
 
 
-        List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(RequestUtil.getDeptIndex()).getData();
+        List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
-        List<User> userList = userFeignClient.getUserInfoByDeptIds(deptIds).getData();
+        if(CollUtil.isEmpty(colleaguesIds)){
-        List<String> userIds = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
-        if(CollUtil.isEmpty(userIds)){
             return pageResult;
         }
 
         LambdaQueryWrapper<UserReportNormalPO> 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<UserReportNormalPO> page = this.page(new Page<>(PageFactory.getPageNum(userReportNormalParam), PageFactory.getPageSize(userReportNormalParam)), lambdaQueryWrapper);
         if (CollUtil.isNotEmpty(page.getRecords())) {

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java

@@ -164,7 +164,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     public Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) {
         String userIndex = RequestUtil.getUserIndex();
         QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
-        userReportVOQueryWrapper.in("supervision_user_report.create_by", CollectionUtil.newArrayList(userIndex))
+
+        List<String> 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<UserReportPOMapper, Use
     @Override
     public Page<UserReportVO> getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam) {
         QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
-        userReportVOQueryWrapper
+
+        List<String> 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())
                 ;