From 0aa6308b8bf599362d17a7c15dcdc12baab323bc Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 27 Jun 2024 17:51:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=91=E5=AE=A4=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=92=8C=E4=B8=AA=E4=BA=BA=E6=9D=A5=E6=AC=BE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=89=80=E5=9C=A8=E9=83=A8?= =?UTF-8?q?=E9=97=A8sql=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllProjectStatisticsController.java | 5 +++-- .../controller/PrincipalPeopleStatisticsController.java | 5 +++-- .../com/jero/modules/system/service/impl/SysBaseApiImpl.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 94d4fdf3..15be2801 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -1,5 +1,6 @@ package com.jero.statistics.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -131,7 +132,7 @@ public class AllProjectStatisticsController { //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) List allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList); //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); + idList.addAll((userMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll(allDepartIds);//项目负责人 } else { @@ -231,7 +232,7 @@ public class AllProjectStatisticsController { //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) List allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList); //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); + idList.addAll((userMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll(allDepartIds); } else { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index de8b1af8..9f9d333a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -1,5 +1,6 @@ package com.jero.statistics.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -80,7 +81,7 @@ public class PrincipalPeopleStatisticsController { //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) List allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList); //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); + idList.addAll((userMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll(allDepartIds); //项目负责人 @@ -185,7 +186,7 @@ public class PrincipalPeopleStatisticsController { //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) List allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList); //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); + idList.addAll((userMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll(allDepartIds); //项目负责人 diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index fadded05..699c700a 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -1121,7 +1121,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { List sysDepartTreeModels =listSonDepartsByDepId(departId); if(!(sysDepartTreeModels.size()==0)) { for (SysDepartTreeModel s : sysDepartTreeModels) { - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", s.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); + idList.addAll((userMapper.selectList(new LambdaQueryWrapper().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, s.getId()))).stream().map(SysUser::getId).collect(Collectors.toList())); getAllUserIdsByDepart(s.getId(),idList); } return idList;