diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 8c6e050f..eb483df7 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -286,7 +286,7 @@ public class TAbilityApplicationController { @GetMapping("getByApplyFlag/{applyFlag}") @ApiOperation("根据申请标识获取能力申请信息") @LogOperation("根据申请标识获取能力申请信息") - public Result getByApplyFlag(@PathVariable("applyFlag") String applyFlag) { + public Result getByApplyFlag(@PathVariable("applyFlag") String applyFlag, @RequestParam Map requestParams) { final UserDetail user = SecurityUser.getUser(); Map params = new HashMap() { { @@ -309,6 +309,14 @@ public class TAbilityApplicationController { return sysDeptDTO.getName(); } })); + + if (requestParams.containsKey("resourceDeptName") && StringUtils.isNotEmpty(requestParams.get("resourceDeptName").toString())) { // 限制只出该资源所属部门的申请情况 + Map> finalResult = result; + result = new HashMap>() {{ + put(requestParams.get("resourceDeptName").toString(), finalResult.get(requestParams.get("resourceDeptName").toString())); + }}; + } + if (applicationDTOS.isEmpty()) { return new Result().ok(null); } @@ -322,8 +330,9 @@ public class TAbilityApplicationController { } } }); + Map> finalResult1 = result; Map>> re = result.keySet().stream().map(index -> { - final List tAbilityApplicationDTOList = result.get(index); + final List tAbilityApplicationDTOList = finalResult1.get(index); if (tAbilityApplicationDTOList.isEmpty()) { return null; }