From c43a7055a1150ebec0c799ced46e1b9680c09938 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Thu, 25 May 2023 11:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=A4=9A=E5=B1=82=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DepositoryRecordController.java           | 20 ++++++++
 .../mapper/DepositoryRecordMapper.xml         | 48 +++++++++++++++----
 .../impl/DepositoryRecordServiceImpl.java     | 10 ++--
 .../service/impl/DepositoryServiceImpl.java   |  3 ++
 4 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
index 929d325f..edb29def 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@@ -849,6 +849,16 @@ public class DepositoryRecordController {
         List<ApplicationInRecordP> list = new ArrayList<>();
         Integer recordPCount = 0;
         Integer maindeparment = userToken.getMaindeparment();
+        if (map.containsKey("depositoryId")) {
+            // 如果包含仓库id
+            Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
+            // 获取当前仓库下所有可见的仓库
+            List<Integer> allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken);
+            if (allChildDepositoryById.size() > 0) {
+                map.put("depositoryIdList", allChildDepositoryById);
+                map.remove("depositoryId");
+            }
+        }
         if (PublicConfig.roleAdminorgList.contains(maindeparment)) {
             list = depositoryRecordService.findApplicationInRecordPByCondition(map, userToken, userKey, token);
             recordPCount = depositoryRecordService.findApplicationInRecordPCountByCondition(map);
@@ -1010,6 +1020,16 @@ public class DepositoryRecordController {
         List<ApplicationOutRecordP> list = new ArrayList<>();
         Integer countBy = 0;
         Integer maindeparment = userByPort.getMaindeparment();
+        if (map.containsKey("depositoryId")) {
+            // 如果包含仓库id
+            Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId"));
+            // 获取当前仓库下所有可见的仓库
+            List<Integer> allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userByPort);
+            if (allChildDepositoryById.size() > 0) {
+                map.put("depositoryIdList", allChildDepositoryById);
+                map.remove("depositoryId");
+            }
+        }
         if (PublicConfig.roleAdminorgList.contains(maindeparment)) {
             list = depositoryRecordService.findApplicationOutRecordPByCondition(map, userByPort, userKey, token);
             countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map);
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index 5739111e..3e866603 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -490,7 +490,7 @@
         <if test="depositoryIdList != null">
             and did in
             <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
-                #{did}
+                #{id}
             </foreach>
         </if>
         <if test="depositoryId != null and depositoryId != ''">
@@ -535,9 +535,20 @@
         <if test="applicantId != null and applicantId != ''">
             and applicantId = #{applicantId}
         </if>
-        <if test="depositoryId != null and depositoryId != ''">
-            and depositoryId = #{depositoryId}
+        <if test="depositoryIdList != null">
+            and ( depositoryId
+            in
+            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            )
+        </if>
+        <if test="depositoryIdList == null">
+            <if test="applicantId != null and applicantId != ''">
+                and applicantId = #{applicantId}
+            </if>
         </if>
+
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>
@@ -852,7 +863,7 @@
         </if>
         <if test="depositoryIdList != null">
             and did in
-            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+            <foreach collection="depositoryIdList" index="index" item="did" open="(" separator="," close=")">
                 #{did}
             </foreach>
         </if>
@@ -877,9 +888,20 @@
         <if test="applicantId != null and applicantId != ''">
             and applicantId = #{applicantId}
         </if>
-        <if test="depositoryId != null and depositoryId != ''">
-            and depositoryId = #{depositoryId}
+        <if test="depositoryIdList != null">
+            and ( depositoryId
+            in
+            <foreach collection="depositoryIdList" index="index" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            )
         </if>
+        <if test="depositoryIdList == null">
+            <if test="applicantId != null and applicantId != ''">
+                and applicantId = #{applicantId}
+            </if>
+        </if>
+
         <if test="mid != null and mid != ''">
             and mid = #{mid}
         </if>
@@ -916,22 +938,30 @@
         <if test="depositoryManagerTime != null and depositoryManagerTime != null">
             and depositoryManagerTime >= #{depositoryManagerTime}
         </if>
-        <if test="depositoryManagerMessage != null and depositoryManagerMessage != null">
+        <if test="depositoryManagerMessage != null and depositoryManagerMessage != ''">
             and depositoryManagerMessage like CONCAT('%', #{depositoryManagerMessage}, '%')
         </if>
-        <if test="aorstate != null and aorstate != null">
+        <if test="aorstate != null and aorstate != ''">
             and aorstate like CONCAT('%', #{state}, '%')
         </if>
         <if test="istransfer != null and istransfer != ''">
             and istransfer = #{istransfer}
         </if>
+        <if test="version != null and version != ''">
+            and mversion = #{version}
+        </if>
+        <if test="code != null and code != ''">
+            and mcode = #{code}
+        </if>
+        <if test="placeId != null">
+            and placeId = #{placeId}
+        </if>
         <if test="adminorgid != null and adminorgid != ''">
             and adminorgid = #{adminorgid}
         </if>
         <if test="constructionunitid != null and constructionunitid != ''">
             and constructionunitid = #{constructionunitid}
         </if>
-
     </select>
 
 
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 964c980a..334c4149 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -4330,7 +4330,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         }
         if (map.containsKey("depositoryId")) {
             depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
-        } else {
+        } else if (!map.containsKey("depositoryIdList")) {
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
             depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition()));
             for (RoleAndDepository depository : depositoryAndRole
@@ -4340,10 +4340,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             if (depositoryIdList.size() == 0) {
                 depositoryIdList = null;
             }
+            map.put("depositoryIdList", depositoryIdList);
         }
-
-        map.put("depositoryIdList", depositoryIdList);
-
         List<ApplicationOutRecord> list = depositoryRecordMapper.findApplicationOutRecordPByUser(map);
         List<ApplicationOutRecordP> result = new ArrayList<>();
         for (ApplicationOutRecord record : list) {
@@ -4376,7 +4374,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         }
         if (map.containsKey("depositoryId")) {
             depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId")));
-        } else {
+        } else if(!map.containsKey("depositoryIdList")){
             List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId());
             depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition()));
 
@@ -4387,9 +4385,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             if (depositoryIdList.size() == 0) {
                 depositoryIdList = null;
             }
+            map.put("depositoryIdList", depositoryIdList);
         }
 
-        map.put("depositoryIdList", depositoryIdList);
         return depositoryRecordMapper.findApplicationOutRecordPCountByUser(map);
     }
 
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
index b5e2e9f6..b82a3bea 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
@@ -433,6 +433,9 @@ public class DepositoryServiceImpl implements DepositoryService {
                 depositoryIdList.add(depository.getId());
             }
         }
+        if(PublicConfig.roleAdminorgList.contains(userByPort.getMaindeparment())){
+            return depositoryIdList;
+        }
         //用于查询当前用户所拥有及所管理的仓库
         List<Integer> depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userByPort);
         depositoryIdList = (List<Integer>) CollectionUtils.intersection(depositoryIdList, depositoryIdForUserHas);