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 2360a10..804d656 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
@@ -148,16 +148,27 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
-        if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
-            alarmTypeStr = "1";
+        List<Map<String, Object>> retList = new ArrayList<>();
+        if (alarmJobService.checkPcRole(currentUser.getRoleTips())) {
+            // pc角色
+            //operation和admin能查设备异常，其他只能查数据异常
+            if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
+                alarmTypeStr = "1";
+            }
+            retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
+        } else {
+            //app角色
+            long leaderId = 0L;
+            if (currentUser.getRoleTips().contains(sLeader)) {
+                // 组长，查组内全部
+                leaderId = currentUser.getId();
+                if (StrUtil.isNotEmpty(jobStatusStr)) {
+                    //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前)
+                    page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr));
+                }
+            }
+            retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr,currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-        if (currentUser.getRoleTips().contains(sLeader) && StrUtil.isNotEmpty(jobStatusStr)) {
-            // 组长，查组内全部
-            //learder&&jobStatus=1,2,3时，关闭传入的sort，按sql排序(自己的排在前)
-            page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr));
-
-        }
-        List<Map<String, Object>>  retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), deptid);
         retList.forEach(this::alarmJobWrapper);
         page.setRecords(retList);
         return ResponseData.success(super.packForBT(page));
@@ -302,7 +313,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), deptid);
+            retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
         } else {
             // app角色
             Long leaderId = 0L;
@@ -340,7 +351,7 @@
             if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) {
                 alarmTypeStr = "1";
             }
-            retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(), deptid);
+            retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid);
         } else {
             // app角色
             Long leaderId = 0L;
@@ -375,7 +386,7 @@
         String deptid = httpServletRequest.getParameter("deptid");
         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);
         jobExpList.forEach(this::alarmJobWrapper);
         List<JobExcelDto> jobExcelDtoList = new ArrayList<>();
         jobExpList.stream().forEach(