修改

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/AttendanceStaffController.java

@@ -38,8 +38,8 @@ public class AttendanceStaffController {
 
     //考勤列表
     @RequestMapping("/getListData")
-    private HttpRespMsg getListData(String month,String userId,Integer pageIndex ,Integer pageSize) {
-        return attendanceStaffService.getListData(month,userId,pageIndex,pageSize);
+    private HttpRespMsg getListData(String month,String userId,Integer pageIndex ,Integer pageSize,HttpServletRequest request) {
+        return attendanceStaffService.getListData(month,userId,pageIndex,pageSize,request);
     }
 
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/AttendanceStaffService.java

@@ -18,7 +18,7 @@ public interface AttendanceStaffService extends IService<AttendanceStaff> {
 
     HttpRespMsg refreshData(String month);
 
-    HttpRespMsg getListData(String month,String userId,Integer pageIndex ,Integer pageSize);
+    HttpRespMsg getListData(String month,String userId,Integer pageIndex ,Integer pageSize,HttpServletRequest request);
 
     HttpRespMsg getAttendanceUserData(String month, String date, String userId, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/AttendanceStaffServiceImpl.java

@@ -51,6 +51,9 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
     @Resource
     private AttendanceRuleService attendanceRuleService;
 
+    @Resource
+    private SysRoleFunctionService sysRoleFunctionService;
+
     @Override
     public HttpRespMsg refreshData(String month) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -471,13 +474,20 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
     }
 
     @Override
-    public HttpRespMsg getListData(String month,String userId,Integer pageIndex ,Integer pageSize) {
+    public HttpRespMsg getListData(String month,String userId,Integer pageIndex ,Integer pageSize,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<AttendanceStaff> wrapper = new QueryWrapper<AttendanceStaff>().eq("month", month);
-        if (StringUtils.isNotBlank(userId)) {
-            User user = userService.getById(userId);
-            wrapper.eq("job_number", user.getJobNumber());
+        User u = userService.getById(request.getHeader("Token"));
+        int count = sysRoleFunctionService.count(new QueryWrapper<SysRoleFunction>().eq("role_id", u.getRoleId()).eq("function_id", 151));
+        if (count>0) {
+            if (StringUtils.isNotBlank(userId)) {
+                User user = userService.getById(userId);
+                wrapper.eq("job_number", user.getJobNumber());
+            }
+        }else {
+            wrapper.eq("job_number", u.getJobNumber());
         }
+
         IPage<AttendanceStaff> iPage = page(new Page(pageIndex, pageSize), wrapper);
         HashMap<String, Object> map = new HashMap<>();
         map.put("total", iPage.getTotal());
@@ -1084,7 +1094,7 @@ public class AttendanceStaffServiceImpl extends ServiceImpl<AttendanceStaffMappe
                         }
                         maplist.add(map);
                     }
-                    staff.setAttendanceTypeName("异常小夜班1");
+                    staff.setAttendanceTypeName("异常小夜班2");
                 }
                 if (!maplist.isEmpty()) {
                     if (!applyFormList.isEmpty()){