From 96bc1f134e2c9be520b7e5f73f791d2042da44d2 Mon Sep 17 00:00:00 2001
From: xia <taume@126.com>
Date: Mon, 19 Sep 2022 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E7=A6=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storeroom3d/repository/SecurityDoorRepository.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/repository/SecurityDoorRepository.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/repository/SecurityDoorRepository.java
index 75cd7b1..a71b231 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/repository/SecurityDoorRepository.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/repository/SecurityDoorRepository.java
@@ -31,7 +31,7 @@ public interface SecurityDoorRepository extends JpaRepository<SecurityDoor, Stri
     @Query(nativeQuery = true,
             countQuery = "select count(1) " +
                     "from security_door sdr inner join device_info di on sdr.device_id = di.id " +
-                    "inner join storeroom room on sdr.storeroom_id = room.id left join borrower br on sdr.user_id = br.id " +
+                    "inner join storeroom room on di.storeroom_id = room.id left join borrower br on sdr.user_id = br.id " +
                     "where if(?1 is null,1=1,room.name like ?1) " +
                     "and if(?2 is null,1=1,di.device_name like ?2) " +
                     "and if(?3 is null,1=1,sdr.create_time >= ?3) " +
@@ -39,7 +39,7 @@ public interface SecurityDoorRepository extends JpaRepository<SecurityDoor, Stri
             value = "select sdr.id as id,sdr.alarm_level as alarmLevel,room.name as roomName,di.device_name as deviceName,sdr.maintitle as maintitle," +
                     "sdr.archive_no as archiveNo,sdr.alarm_msg as alarmMsg,sdr.alarm_event as alarmEvent,br.borrower_name as borrowerName,sdr.create_time as createTime " +
                     "from security_door sdr inner join device_info di on sdr.device_id = di.id " +
-                    "inner join storeroom room on sdr.storeroom_id = room.id left join borrower br on sdr.user_id = br.id " +
+                    "inner join storeroom room on di.storeroom_id = room.id left join borrower br on sdr.user_id = br.id " +
                     "where if(?1 is null,1=1,room.name like ?1) " +
                     "and if(?2 is null,1=1,di.device_name like ?2) " +
                     "and if(?3 is null,1=1,sdr.create_time >= ?3) " +