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); }