Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
guosongrui
2024-05-24 16:23:12 +08:00
parent 4e7d865e0c
commit 3f7a5da207
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,6 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
//获取当前用户部门所有同事的id，查看该部门下所有的数据 //获取当前用户部门所有同事的id，查看该部门下所有的数据
List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
queryWrapper.in("supervision_dev_main_report.create_by", colleaguesIds) queryWrapper.in("supervision_dev_main_report.create_by", colleaguesIds)
.eq("supervision_dev_main_report.state", DataStateEnum.ENABLE.getCode()); .eq("supervision_dev_main_report.state", DataStateEnum.ENABLE.getCode());
if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgNo())) { if (StrUtil.isNotBlank(supervisionDevMainReportQuery.getOrgNo())) {

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

@@ -162,7 +162,6 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
*/ */
@Override @Override
public Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) { public Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) {
String userIndex = RequestUtil.getUserIndex();
QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>(); QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();