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 f9852c9..8b1793e 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
@@ -171,7 +171,7 @@
                 }
             }
             retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode);
-            retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr,currentUser.getDeptId(), currentUser.getId(), leaderId);
+//            retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr,currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
@@ -392,7 +392,7 @@
         String devCode = httpServletRequest.getParameter("devCode");
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        List<Map<String, Object>> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+//        List<Map<String, Object>> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
         List<Map<String, Object>> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode);
         jobExpList.forEach(this::alarmJobWrapper);
         List<JobExcelDto> jobExcelDtoList = new ArrayList<>();