diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 8b3f54a..5721c6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -27,7 +27,7 @@
 
     List<Map<String, Object>> jobListDelayRe(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 8b3f54a..5721c6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -27,7 +27,7 @@
 
     List<Map<String, Object>> jobListDelayRe(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 07af8c9..c67ac05 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -99,9 +99,9 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) {
+    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) {
         alarmContent = converAlarmContent(alarmContent);
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId);
+        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId);
         return alarmJobList;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 8b3f54a..5721c6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -27,7 +27,7 @@
 
     List<Map<String, Object>> jobListDelayRe(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 07af8c9..c67ac05 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -99,9 +99,9 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) {
+    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) {
         alarmContent = converAlarmContent(alarmContent);
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId);
+        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId);
         return alarmJobList;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 8a57cae..92210b0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -30,7 +30,7 @@
     // List<AlarmJob> jobListExport(@Param("page") Page<AlarmJob> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope);
     List<Map<String, Object>> jobListDelayRe(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 8b3f54a..5721c6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -27,7 +27,7 @@
 
     List<Map<String, Object>> jobListDelayRe(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 07af8c9..c67ac05 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -99,9 +99,9 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) {
+    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) {
         alarmContent = converAlarmContent(alarmContent);
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId);
+        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId);
         return alarmJobList;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 8a57cae..92210b0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -30,7 +30,7 @@
     // List<AlarmJob> jobListExport(@Param("page") Page<AlarmJob> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope);
     List<Map<String, Object>> jobListDelayRe(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5437b1d..94f0c9b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -669,7 +669,6 @@
         AND aj.JOB_STATUS = '0'
         AND aj.JOB_FLAG_DELAY = '1'
         AND ar.ALARM_TYPE = '1'
-        AND bwi.responsible_dept = #{deptId}
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
             <include refid="keywords_sql"/>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 8b3f54a..5721c6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -27,7 +27,7 @@
 
     List<Map<String, Object>> jobListDelayRe(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 07af8c9..c67ac05 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -99,9 +99,9 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) {
+    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) {
         alarmContent = converAlarmContent(alarmContent);
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId);
+        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId);
         return alarmJobList;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 8a57cae..92210b0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -30,7 +30,7 @@
     // List<AlarmJob> jobListExport(@Param("page") Page<AlarmJob> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope);
     List<Map<String, Object>> jobListDelayRe(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5437b1d..94f0c9b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -669,7 +669,6 @@
         AND aj.JOB_STATUS = '0'
         AND aj.JOB_FLAG_DELAY = '1'
         AND ar.ALARM_TYPE = '1'
-        AND bwi.responsible_dept = #{deptId}
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b8242c4..49af280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -47,49 +47,28 @@
         CONCAT('%',#{keywords},'%')
     </sql>
 
-    <sql id="alarm_list_clounms" databaseId="mysql">
-        ar.ID as id,
-        ar.WELL_CODE as wellCode,
-        ar.ALARM_CONTENT as alarmContentName,
-        DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s')
-        AS alarmTime,
-        ar.DEVICE_ID as deviceId,
-        ar.STATUS as status,
-        ar.alarm_type as alarmType,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.DEVCODE as devcode,
-        aj.JOB_STATUS as jobStatus,
-        ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
-    <sql id="alarm_list_clounms" databaseId="oracle">
-        ar.ID as id,
-        ar.WELL_CODE as wellCode,
-        ar.ALARM_CONTENT as alarmContentName,
-        TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss')
-        AS alarmTime,
-        ar.DEVICE_ID as deviceId,
-        ar.STATUS as status,
-        ar.alarm_type as alarmType,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.DEVCODE as devcode,
-        aj.JOB_STATUS as jobStatus,
-        ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
 
-    <sql id="alarm_list_clounms" databaseId="pgsql">
-         ar.ID as id,
+    <select id="alarmList" resultType="map">
+        SELECT
+        ar.ID as id,
         ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
-        TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss')
+        <include refid="date_toChar">
+            <property name="paramTime" value="ar.ALARM_TIME"/>
+        </include>
         AS "alarmTime",
         ar.STATUS as "status",
         ar.alarm_type as "alarmType",
@@ -100,16 +79,11 @@
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
-    </sql>
-
-
-    <select id="alarmList" resultType="map">
-        SELECT
-        <include refid="alarm_list_clounms"/>
         FROM alarm_records ar
+        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE 1=1
+        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        WHERE   ar.STATUS = '1' AND  rdv.VALID='1'
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 528b2fb..c06bfc1 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -311,7 +311,7 @@
                 // 组长，查组内全部
                 leaderId = currentUser.getId();
             }
-            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId);
+            retList = alarmJobService.jobListDelayReApp(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
index 8b3f54a..5721c6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
@@ -27,7 +27,7 @@
 
     List<Map<String, Object>> jobListDelayRe(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent,DataScope dataScope, Long userId, Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 07af8c9..c67ac05 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -99,9 +99,9 @@
     }
 
     @Override
-    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) {
+    public List<Map<String, Object>> jobListDelayReApp(Page<Map<String, Object>> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId, Long leaderId) {
         alarmContent = converAlarmContent(alarmContent);
-        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId);
+        List<Map<String, Object>> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId, leaderId);
         return alarmJobList;
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
index 8a57cae..92210b0 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
@@ -30,7 +30,7 @@
     // List<AlarmJob> jobListExport(@Param("page") Page<AlarmJob> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope);
     List<Map<String, Object>> jobListDelayRe(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
-    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
+    List<Map<String, Object>> jobListDelayReApp(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId, @Param("leaderId") Long leaderId);
 
     List<Map<String, Object>> jobListDelayPro(@Param("page") Page<Map<String, Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5437b1d..94f0c9b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -669,7 +669,6 @@
         AND aj.JOB_STATUS = '0'
         AND aj.JOB_FLAG_DELAY = '1'
         AND ar.ALARM_TYPE = '1'
-        AND bwi.responsible_dept = #{deptId}
         <if test="keywords!='' and keywords!=null">
             and aj.WELL_CODE like
             <include refid="keywords_sql"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index b8242c4..49af280 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -47,49 +47,28 @@
         CONCAT('%',#{keywords},'%')
     </sql>
 
-    <sql id="alarm_list_clounms" databaseId="mysql">
-        ar.ID as id,
-        ar.WELL_CODE as wellCode,
-        ar.ALARM_CONTENT as alarmContentName,
-        DATE_FORMAT(ar.ALARM_TIME,'%Y-%m-%d %H:%i:%s')
-        AS alarmTime,
-        ar.DEVICE_ID as deviceId,
-        ar.STATUS as status,
-        ar.alarm_type as alarmType,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.DEVCODE as devcode,
-        aj.JOB_STATUS as jobStatus,
-        ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
-    <sql id="alarm_list_clounms" databaseId="oracle">
-        ar.ID as id,
-        ar.WELL_CODE as wellCode,
-        ar.ALARM_CONTENT as alarmContentName,
-        TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss')
-        AS alarmTime,
-        ar.DEVICE_ID as deviceId,
-        ar.STATUS as status,
-        ar.alarm_type as alarmType,
-        ar.ALARM_VALUE AS alarmValue,
-        ar.ALARM_LEVEL AS alarmLevel,
-        ar.ALARM_MSG AS alarmMessage,
-        ar.DEVCODE as devcode,
-        aj.JOB_STATUS as jobStatus,
-        ar.JOB_ID as jobId,
-        bwi.DEPTID AS deptid
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
 
 
-    <sql id="alarm_list_clounms" databaseId="pgsql">
-         ar.ID as id,
+    <select id="alarmList" resultType="map">
+        SELECT
+        ar.ID as id,
         ar.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
-        TO_CHAR(ar.ALARM_TIME,'yyyy-mm-dd hh24:mi:ss')
+        <include refid="date_toChar">
+            <property name="paramTime" value="ar.ALARM_TIME"/>
+        </include>
         AS "alarmTime",
         ar.STATUS as "status",
         ar.alarm_type as "alarmType",
@@ -100,16 +79,11 @@
         aj.JOB_STATUS as "jobStatus",
         ar.JOB_ID as "jobId",
         bwi.DEPTID AS deptid
-    </sql>
-
-
-    <select id="alarmList" resultType="map">
-        SELECT
-        <include refid="alarm_list_clounms"/>
         FROM alarm_records ar
+        JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
         LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
-        WHERE 1=1
+        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        WHERE   ar.STATUS = '1' AND  rdv.VALID='1'
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index 09bcf46..3d7d1eb 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -22,6 +22,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -29,6 +30,7 @@
 import org.springframework.validation.Validator;
 
 import javax.annotation.Resource;
+import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -129,8 +131,8 @@
     }
 
     private ResponseData catchMybatisPlusException(Exception e, String errorMsg) {
-        if (e instanceof MybatisPlusException) {
-            MybatisPlusException mybatisPlusException = (MybatisPlusException) e;
+        if (e instanceof DataAccessException) {
+            DataAccessException mybatisPlusException = (DataAccessException) e;
             String message = mybatisPlusException.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
                 return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", ""));