From 8ff33d570ef9684baf64d885fda9b0b5e520f8db Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 12 Jan 2023 14:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=83=BD=E5=8A=9B=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E8=AF=A6=E6=83=85=E5=8F=AF=E8=BF=87=E6=BB=A4=E5=8F=AA?=
 =?UTF-8?q?=E5=87=BA=E6=9F=90=E4=B8=AA=E8=B5=84=E6=BA=90=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TAbilityApplicationController.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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<TAbilityApplicationV2DTO> getByApplyFlag(@PathVariable("applyFlag") String applyFlag) {
+    public Result<TAbilityApplicationV2DTO> getByApplyFlag(@PathVariable("applyFlag") String applyFlag, @RequestParam Map<String, Object> requestParams) {
         final UserDetail user = SecurityUser.getUser();
         Map<String, Object> params = new HashMap<String, Object>() {
             {
@@ -309,6 +309,14 @@ public class TAbilityApplicationController {
                 return sysDeptDTO.getName();
             }
         }));
+
+        if (requestParams.containsKey("resourceDeptName") && StringUtils.isNotEmpty(requestParams.get("resourceDeptName").toString())) { // 限制只出该资源所属部门的申请情况
+            Map<String, List<TAbilityApplicationDTO>> finalResult = result;
+            result = new HashMap<String, List<TAbilityApplicationDTO>>() {{
+                put(requestParams.get("resourceDeptName").toString(), finalResult.get(requestParams.get("resourceDeptName").toString()));
+            }};
+        }
+
         if (applicationDTOS.isEmpty()) {
             return new Result<TAbilityApplicationV2DTO>().ok(null);
         }
@@ -322,8 +330,9 @@ public class TAbilityApplicationController {
                 }
             }
         });
+        Map<String, List<TAbilityApplicationDTO>> finalResult1 = result;
         Map<String, List<Map<String, Object>>> re = result.keySet().stream().map(index -> {
-            final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = result.get(index);
+            final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = finalResult1.get(index);
             if (tAbilityApplicationDTOList.isEmpty()) {
                 return null;
             }