datalistPageV3回退

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

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);
 
     /**

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

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>