11.25

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -63,8 +63,10 @@ public class DeptController {
         if (!createReqVO.getLeaderUserId().equals("") && !createReqVO.getLeaderUserId().isEmpty()) {
             for (Long teacherId : createReqVO.getLeaderUserId()) {//设置负责人的工作间
                 AdminUserDO teacher = adminUserService.getUser(teacherId);
-                teacher.setDeptId(deptId);
-                adminUserService.updateUser(BeanUtils.toBean(teacher, UserSaveReqVO.class));
+                if (teacher!=null) {
+                    teacher.setDeptId(deptId);
+                    adminUserService.updateUser(BeanUtils.toBean(teacher, UserSaveReqVO.class));
+                }
             }
         }
         return success(deptId);

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

@@ -64,7 +64,7 @@ public class StudentAttendanceController {
 //        checkAttendanceSecond();
 //    }
 
-    @Scheduled(cron = "0 25 21 * * ?") // 每天0:00检测，更新未打卡
+    @Scheduled(cron = "0 32 21 * * ?") // 每天0:00检测，更新未打卡
     @Idempotent(timeout = 10)
     public void attendanceNormalFirst() {
         checkAttendanceFirst();

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

@@ -36,8 +36,8 @@ public class StudentExportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-    @ExcelProperty("专硕名称")
-    private String masterType;
+//    @ExcelProperty("专硕名称")
+//    private String masterType;
 
     @ExcelProperty(value = "用户性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)

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

@@ -39,8 +39,8 @@ public class StudentImportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-    @ExcelProperty("专硕名称")
-    private String masterType;
+//    @ExcelProperty("专硕名称")
+//    private String masterType;
 
     @ExcelProperty(value = "用户性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)

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

@@ -42,8 +42,8 @@ public class graduateStudentImportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-    @ExcelProperty("专硕名称")
-    private String masterType;
+//    @ExcelProperty("专硕名称")
+//    private String masterType;
 
     @ExcelProperty("学号")
     private String userNumber;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/studentAttendance/StudentAttendanceServiceImpl.java

@@ -149,7 +149,10 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
         PageResult<StudentAttendanceDO> result = studentAttendanceMapper.selectErrorPage(pageReqVO,roleIds,loginId);
         result.getList().stream().forEach(attendanceDO-> {
             if (attendanceDO.getSupervisorId()!=null){
-                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+                AdminUserDO supervisor = adminUserService.getUser(attendanceDO.getSupervisorId());
+                if (supervisor!=null) {
+                    attendanceDO.setSupervisor(supervisor.getNickname());
+                }
             }
             if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
                 attendanceDO.setDeptName("测绘学院");
@@ -202,8 +205,9 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
         PageResult<StudentAttendanceDO> result =  studentAttendanceMapper.selectExcusedPage(pageReqVO,roleIds,loginId);
         result.getList().stream().forEach(attendanceDO-> {
-            if (attendanceDO.getSupervisorId()!=null){
-                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+            AdminUserDO supervisor = adminUserService.getUser(attendanceDO.getSupervisorId());
+            if (supervisor!=null) {
+                attendanceDO.setSupervisor(supervisor.getNickname());
             }
             if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
                 attendanceDO.setDeptName("测绘学院");
@@ -218,8 +222,9 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
         List<StudentAttendanceDO> result =  studentAttendanceMapper.selectExcusedList(pageReqVO,roleIds,loginId);
         result.stream().forEach(attendanceDO-> {
-            if (attendanceDO.getSupervisorId()!=null){
-                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+            AdminUserDO supervisor = adminUserService.getUser(attendanceDO.getSupervisorId());
+            if (supervisor!=null) {
+                attendanceDO.setSupervisor(supervisor.getNickname());
             }
             if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
                 attendanceDO.setDeptName("测绘学院");