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 @@
from applicationInRecordInfo
where 1 = 1
+ and airapproverPass in (1,4)
and did in
#{depositoryId}
+
@@ -710,6 +712,7 @@
from applicationInRecordInfo
where 1 = 1
+ and airapproverPass in (1,4)
and applicant_time between #{start} and #{end}
and did in
@@ -718,6 +721,7 @@
+