From 6050e94b49e97f514ad9fcdfe2217b68af69544d Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Tue, 24 Sep 2024 18:30:22 +0800
Subject: [PATCH] =?UTF-8?q?datalistPageV3=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/datasource/firemanager/FireRecordMapper.java      | 1 +
 .../com/zcloud/service/firemanager/FireRecordService.java    | 1 +
 .../service/firemanager/impl/FireRecordServiceImpl.java      | 5 +++++
 .../mybatis/datasource/firemanager/FireRecordMapper.xml      | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
index e1de0696..20874926 100644
--- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
@@ -89,6 +89,7 @@ public interface FireRecordMapper {
 
     List<PageData> datalistPageV2(Page page);
 
+    List<PageData> datalistPageV3(Page page);
     List<PageData> datalistPage(Page page);
 
     List<PageData> getCheckingByCid(String fireCheckId);
diff --git a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
index 982a1b70..799c900b 100644
--- a/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
+++ b/src/main/java/com/zcloud/service/firemanager/FireRecordService.java
@@ -80,6 +80,7 @@ public interface FireRecordService {
     List<PageData> getCheckListByApp(Page page);
     List<PageData> getCheckListByAppV2(Page page);
 
+    List<PageData> getCheckListByAppV3(Page page);
     List<PageData> getCheckRecordByPid(PageData pd);
 
     /**
diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
index cf278764..866c66a6 100644
--- a/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
+++ b/src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
@@ -723,6 +723,11 @@ public class FireRecordServiceImpl implements FireRecordService {
         return data;
     }
 
+    @Override
+    public List<PageData> getCheckListByAppV3(Page page) {
+        List<PageData> data = fireRecordMapper.datalistPageV3(page);
+        return data;
+    }
     @Override
     public List<PageData> getCheckRecordByPid(PageData pd) {
         return fireRecordMapper.getCheckRecordByPid(pd);
diff --git a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
index 081c690b..bd0a81ec 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireRecordMapper.xml
@@ -1071,7 +1071,7 @@
                     </if>
                 </when>
                 <when test='pd.roleLevel == "1"'>
-                    and cl.DEPARTMENT_ID in (${pd.supDeparIds})
+                    and cp.DEPARTMENT_ID in (${pd.supDeparIds})
                 </when>
                 <when test='pd.roleLevel == "2"'>
                     <if test="pd.FIRE_POINT_ID != null and pd.FIRE_POINT_ID != ''">
@@ -1084,4 +1084,5 @@
         FIRE_CHECK_ID
         order by fr. CREATTIME
     </select>
+
 </mapper>