Crazy 4 mēneši atpakaļ
vecāks
revīzija
cdfef71754

+ 2 - 2
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();
 //        checkAttendanceSecond();
 //    }
 //    }
 
 
-    @Scheduled(cron = "0 32 21 * * ?") // 每天0:00检测,更新未打卡
+    @Scheduled(cron = "0 00 00 * * ?") // 每天0:00检测,更新未打卡
     @Idempotent(timeout = 10)
     @Idempotent(timeout = 10)
     public void attendanceNormalFirst() {
     public void attendanceNormalFirst() {
         checkAttendanceFirst();
         checkAttendanceFirst();
@@ -87,7 +87,7 @@ public class StudentAttendanceController {
 
 
          for (AdminUserDO user : userList) {
          for (AdminUserDO user : userList) {
              if (user.getUserNumber() != null) {
              if (user.getUserNumber() != null) {
-                 attendanceReqVO.setUserNumber(user.getUserNumber());
+                 attendanceReqVO.setStudentId(Math.toIntExact(user.getId()));
                  List<StudentAttendanceDO> result = studentAttendanceService.getStudentAttendanceAllList(attendanceReqVO);
                  List<StudentAttendanceDO> result = studentAttendanceService.getStudentAttendanceAllList(attendanceReqVO);
                      //请假了result不为空也不会插入未打卡
                      //请假了result不为空也不会插入未打卡
                  if (result == null || result.isEmpty()) {
                  if (result == null || result.isEmpty()) {

+ 11 - 10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -175,19 +175,20 @@ public class AdminUserServiceImpl implements AdminUserService {
 
 
             //获取原来的工作间删除负责人
             //获取原来的工作间删除负责人
             AdminUserDO user = getUser(updateObj.getId());
             AdminUserDO user = getUser(updateObj.getId());
+            if (user!=null) {
+                DeptDO originDept = deptService.getDept(user.getDeptId());
 
 
-            DeptDO originDept = deptService.getDept(user.getDeptId());
+                DeptSaveReqVO originNewDept = BeanUtils.toBean(originDept, DeptSaveReqVO.class);
 
 
-            DeptSaveReqVO originNewDept = BeanUtils.toBean(originDept, DeptSaveReqVO.class);
-
-            if (originDept!=null) {
-                List<Long> originLeaderIdList = originNewDept.getLeaderUserId();
-                if (originLeaderIdList == null) {
-                    originLeaderIdList = new ArrayList<>(); // 如果为空,则初始化为空列表
+                if (originDept != null) {
+                    List<Long> originLeaderIdList = originNewDept.getLeaderUserId();
+                    if (originLeaderIdList == null) {
+                        originLeaderIdList = new ArrayList<>(); // 如果为空,则初始化为空列表
+                    }
+                    originLeaderIdList.removeIf(leaderId -> leaderId.equals(user.getId()));
+                    originNewDept.setLeaderUserId(originLeaderIdList);  // 设置更新后的负责人列表
+                    deptService.updateDept(originNewDept);
                 }
                 }
-                originLeaderIdList.removeIf(leaderId -> leaderId.equals(user.getId()));
-                originNewDept.setLeaderUserId(originLeaderIdList);  // 设置更新后的负责人列表
-                deptService.updateDept(originNewDept);
             }
             }
 
 
             //添加部门负责人
             //添加部门负责人