From a130bf22aa2693fc8cb5bfbba5df6ff3d48d9c17 Mon Sep 17 00:00:00 2001
From: xia <taume@126.com>
Date: Tue, 16 Aug 2022 13:26:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E9=97=A8=E7=A6=81=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=202.=E4=BC=98=E5=8C=963d=E5=8C=BA=E5=88=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E5=BA=93=E5=B7=B2=E5=80=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/archives/repository/ArchivesTagRepository.java     | 3 ++-
 .../storeroom3d/service/impl/SecurityDoorServiceImpl.java      | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java
index 6f66a37..10b4af1 100644
--- a/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java
+++ b/archives/src/main/java/com/storeroom/modules/archives/repository/ArchivesTagRepository.java
@@ -27,7 +27,8 @@ public interface ArchivesTagRepository extends JpaRepository<ArchivesTag, String
     void updateEasByTid(String tid,Integer eas);
 
     @Query(nativeQuery = true,
-            value = "select position,part_No,row_No,direction,(select count(1) from archives_summary asy where find_in_set(asy.folder_location,position)) as total," +
+            value = "select position,part_No,row_No,direction,(select count(1) from archives_summary asy " +
+                    "where asy.category_type in (3,5) and find_in_set(asy.folder_location,position)) as total," +
                     "(select count(1) from borrow_archives ba inner join archives_summary asy on ba.archives_id = asy.archives_id " +
                     "where ba.borrow_type = 3 and find_in_set(asy.folder_location,position)) as borrow from device_archives_tag dat " +
                     "where device_info_id = ?1 and area_No = ?2 and column_row_No = ?3 order by part_No asc,row_No asc,direction desc")
diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/SecurityDoorServiceImpl.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/SecurityDoorServiceImpl.java
index 16a0cf4..28255e4 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/SecurityDoorServiceImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/SecurityDoorServiceImpl.java
@@ -66,6 +66,8 @@ public class SecurityDoorServiceImpl implements SecurityDoorService {
     public Object initSecurityDoorLog(String roomName, String deviceName, String startTime, String endTime, Pageable page) {
         roomName = StringUtils.isEmpty(roomName) ? null : "%"+ roomName +"%";
         deviceName = StringUtils.isEmpty(deviceName) ? null : "%"+ deviceName +"%";
+        startTime = StringUtils.isEmpty(startTime) ? null : startTime;
+        endTime = StringUtils.isEmpty(endTime) ? null : endTime;
         return PageUtil.toPage(securityDoorRepository.initSecurityDoorLog(roomName,deviceName,startTime,endTime,page));
     }