11.7

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentAttendance/StudentAttendanceController.java

@@ -187,43 +187,53 @@ public class StudentAttendanceController {
                         BeanUtils.toBean(list, StudentAttendanceRespVO.class));
     }
 
+    //都是20条
     @GetMapping("/dayAttendance")
     @Operation(summary = "获得所有人当日出勤列表")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
+//    @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
     public CommonResult<List<StudentAttendanceDO>> getDayStudentAttendance () {
         LocalDate localDate = LocalDate.now();
-        StudentAttendancePageReqVO pageReqVO =new StudentAttendancePageReqVO();
-        pageReqVO.setClockInStatus("0");//正常
-        pageReqVO.setDate(localDate);
-        List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentAttendanceList(pageReqVO);
-        List<StudentAttendanceDO> result =new ArrayList<>();
-        for (StudentAttendanceDO attendance :attendanceList ){
-            attendance.setSupervisor(adminUserService.getUser(attendance.getSupervisorId()).getNickname());//导师名字
-            attendance.setDeptName(deptService.getDept(attendance.getDeptId()).getName());//工作间名称
+        StudentAttendancePageReqVO ReqVO =new StudentAttendancePageReqVO();
+        ReqVO.setDate(localDate);
+        List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentAttendanceList(ReqVO);
+        List<StudentAttendanceDO> result = new ArrayList<>();
+        int limit = Math.min(20, attendanceList.size());
+        for (int i = 0; i < limit; i++) {
+            StudentAttendanceDO attendance = attendanceList.get(i);
+            attendance.setSupervisor(adminUserService.getUser(attendance.getSupervisorId()).getNickname());
+            attendance.setDeptName(deptService.getDept(attendance.getDeptId()).getName());
+            // 将处理后的记录加入结果列表
             result.add(attendance);
         }
         return success(result);
-
     }
 
 
     @GetMapping("/dayErrorAttendance")
     @Operation(summary = "获得所有人当日未打卡列表")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:dayError')")
+//    @PreAuthorize("@ss.hasPermission('system:student-attendance:dayError')")
     public CommonResult<List<StudentAttendanceDO>> getDayStudentErrorAttendance () {
         LocalDate localDate = LocalDate.now();
         StudentAttendancePageReqVO reqVO =new StudentAttendancePageReqVO();
         reqVO.setDate(localDate);
-        reqVO.setClockInStatus("1");//未打卡
         List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentAttendanceErrorList(reqVO);
-        return success(attendanceList);
+        List<StudentAttendanceDO> result = new ArrayList<>();
+        int limit = Math.min(20, attendanceList.size());
+        for (int i = 0; i < limit; i++) {
+            StudentAttendanceDO attendance = attendanceList.get(i);
+            attendance.setSupervisor(adminUserService.getUser(attendance.getSupervisorId()).getNickname());
+            attendance.setDeptName(deptService.getDept(attendance.getDeptId()).getName());
+            // 将处理后的记录加入结果列表
+            result.add(attendance);
+        }
+        return success(result);
     }
 
 
     //当周有一次未打卡则异常
     @GetMapping("/weekendAttendance")
     @Operation(summary = "周出勤统计")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
+//    @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
     public CommonResult<weekendAttendanceResVO> getWeekendAttendance () {
         List<AdminUserDO>studentList = adminUserService.getAllUserList();
         //获取当天所在的一周内

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -441,7 +441,7 @@ public class UserController {
 
     @GetMapping("/getDetail")
     @Operation(summary = "基本信息展示")
-    @PreAuthorize("@ss.hasPermission('system:user:homeDetail')")
+//    @PreAuthorize("@ss.hasPermission('system:user:homeDetail')")
     public CommonResult<Map<String,Integer>> getDetail() throws Exception {
         UserPageReqVO reqVO= new UserPageReqVO();
         DeptListReqVO deptVO =new DeptListReqVO();