From 753e4b4b280038ed2e992597186dd5619b7120d4 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Tue, 7 Dec 2021 11:25:00 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=BB=9F=E8=AE=A1=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AD=89=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AllProjectStatisticsController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 68628e18..6efb5c17 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 @@ -10,6 +10,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.system.vo.SysDepartModel; import com.jero.common.system.vo.SysDepartTreeModel; import com.jero.common.util.oConvertUtils; import com.jero.mail.commont.constant; @@ -366,14 +367,15 @@ public class AllProjectStatisticsController { } - @ApiOperation(value = "查询列表", notes = "查询列表") + @ApiOperation(value = "通过部门id查所有人员", notes = "通过部门id查所有人员") @RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET) public Result listForUserByOrgCode(@RequestParam(name = "departId",required = true) String departId) { List sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(departId); + SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(departId); List orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList()); + orgCodes.add(sysDepartModel.getOrgCode()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("org_code",orgCodes); - queryWrapper.ne("username","_reserve_user_external"); List pageList = sysUserService.list(queryWrapper); return Result.OK(pageList); }