10.31

yudao-module-md/yudao-module-md-biz/src/main/java/cn/iocoder/yudao/module/md/controller/admin/AcsController.java

@@ -277,6 +277,7 @@ public class AcsController {
                                                        @RequestParam("employeeNo") String employeeNo) {
         try {
             String result = acsService.teacherUpdateUserImage(employeeNo,photoUrl);
+            System.out.println(result);
             return CommonResult.success(result);
         } catch (Exception e) {
             return CommonResult.error(500, "导入过程中发生错误: " + e.getMessage());

yudao-module-md/yudao-module-md-biz/src/main/java/cn/iocoder/yudao/module/md/controller/admin/vo/attendanceImportRespVO.java

@@ -15,8 +15,8 @@ public class attendanceImportRespVO {
     @Schema(description = "创建成功的用户名数组", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<String> createUsernames;
 
-    @Schema(description = "更新成功的用户名数组", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<String> updateUsernames;
+    @Schema(description = "已经存在的用户名数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<String> existUsernames;
 
     @Schema(description = "导入失败的用户集合，key 为用户名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, String> failureUsernames;

yudao-module-md/yudao-module-md-biz/src/main/java/cn/iocoder/yudao/module/md/service/AcsService.java

@@ -355,7 +355,7 @@ public class AcsService {
                 if (userInfoArray != null) {
                     String msg = addFaceByUrl(employeeNo, photoUrl);
                     if (msg.contains("下发人脸成功") && msg.contains("但是有异常情况")) {
-                        return "更新照片失败，请检查照片大小";
+                        return "更新照片失败，请检查照片大小并确保包含人脸";
                     } else {
                         if (user != null) {
                             user.setPhotoUrl(photoUrl);
@@ -373,7 +373,7 @@ public class AcsService {
     public attendanceImportRespVO importUserList(List<attendanceImportExcelVO> importUsers) {
 
         attendanceImportRespVO respVO = attendanceImportRespVO.builder().createUsernames(new ArrayList<>())
-                .updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
+                .existUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
         importUsers.forEach(importUser -> {
 
                 try {
@@ -386,6 +386,8 @@ public class AcsService {
                             if (userInfoArray==null) {//没有userInfo
                                 UserManage.addUserInfo(lUserID, importUser.getEmployeeNo(), importUser.getName());
                                 respVO.getCreateUsernames().add(importUser.getName());
+                            }else{
+                                respVO.getExistUsernames().add(importUser.getName());
                             }
                 } catch (UnsupportedEncodingException | InterruptedException | JSONException e) {
                     throw new RuntimeException("添加用户信息失败: " + e.getMessage(), e);

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

@@ -195,7 +195,7 @@ public class StudentAttendanceController {
 
     @GetMapping("/dayErrorAttendance")
     @Operation(summary = "获得所有人当日警告列表")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")
+    @PreAuthorize("@ss.hasPermission('system:student-attendance:dayError')")
     public CommonResult<List<StudentAttendanceDO>> getDayStudentErrorAttendance () {
         LocalDate localDate = LocalDate.now();
         List<StudentAttendanceDO> attendanceList =studentAttendanceService.getStudentsAttendanceDay(localDate);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java

@@ -15,6 +15,7 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeptDO>()
+                .eqIfPresent(DeptDO::getLeaderUserId,reqVO.getLeaderUserId())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
     }