1.优化门禁日志

2.优化3d区列显示在库已借

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")

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));
     }