From ff800716ca48c96ec938b950f550736c925335d4 Mon Sep 17 00:00:00 2001
From: xia <taume@126.com>
Date: Wed, 9 Nov 2022 08:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=A8=E7=A6=81=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/storeroom3d/controller/SecurityDoorController.java | 3 ++-
 .../modules/storeroom3d/repository/SecurityDoorRepository.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/SecurityDoorController.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/SecurityDoorController.java
index 4062c04..9953522 100644
--- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/SecurityDoorController.java
+++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/SecurityDoorController.java
@@ -111,7 +111,8 @@ public class SecurityDoorController {
             content[i][5] = map.get("archiveNo") + "";
             Integer alarmEvent = Integer.parseInt(map.get("alarmEvent") == null ? "0" : map.get("alarmEvent") + "");
             content[i][6] = alarmEvent == 0 ? "出" : "进";
-            content[i][7] = map.get("borrowerName") + "";
+            String borrowerName = map.get("borrowerName") + "";
+            content[i][7] = StringUtils.isEmpty(borrowerName) || "null".equals(borrowerName) ? "" : borrowerName;
             content[i][8] = map.get("alarmMsg") + "";
             content[i][9] = map.get("createTime") + "";
         }
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 a71b231..c0445e6 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
@@ -50,7 +50,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) " +