From 722e7791810e9640a66223b337001ef9c30753c2 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 27 Feb 2023 11:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/controller/MaterialController.java      | 3 ++-
 .../depository_manage/mapper/DepositoryRecordMapper.xml       | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
index 99bebd91..0b82d456 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -204,7 +204,8 @@ public class MaterialController {
             ) {
                 inventoryP.setSplitInfoList(splitUnitService.findSplitInfoByMid(inventoryP.getMid()));
             }
-        }else{
+        }
+        else{
             list = materialService.findInventory(map);
             total = materialService.findInventoryCount(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 ca164afa..595399c3 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -696,10 +696,12 @@
         <include refid="ApplicationInRecordInfo"/>
         from applicationInRecordInfo
         where  1 = 1
+        and airapproverPass in (1,4)
         and did in
         <foreach collection="list" index="index" item="depositoryId" open="(" separator="," close=")">
             #{depositoryId}
         </foreach>
+
     </select>
 
 
@@ -710,6 +712,7 @@
         <include refid="ApplicationInRecordInfo"/>
         from applicationInRecordInfo
         where  1 = 1
+        and airapproverPass in (1,4)
         and applicant_time between #{start} and #{end}
         <if test="list != null">
             and did in
@@ -718,6 +721,7 @@
             </foreach>
         </if>
 
+
     </select>
     <!--    查询所有出库记录-->
     <select id="findApplicationOutRecordPAll" resultMap="applicationOutRecord">