11.14,改了巨多

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

@@ -10,6 +10,9 @@ public class DeptListReqVO {
     @Schema(description = "部门名称，模糊匹配", example = "芋道")
     private String name;
 
+    @Schema(description = "部门id，模糊匹配", example = "114")
+    private String deptId;
+
     @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
 
@@ -22,4 +25,7 @@ public class DeptListReqVO {
     @Schema(description = "邮箱")
     private String email;
 
+    @Schema(description = "地址")
+    private String address;
+
 }

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

@@ -78,6 +78,7 @@ public class StudentAttendanceController {
         reqVO.setUserType("1");//学生
         List<AdminUserDO> userList = adminUserService.getUserList(reqVO);
         LocalDate localDate = LocalDate.now();
+
         attendanceReqVO.setDate(localDate);
 
          for (AdminUserDO user : userList) {
@@ -126,6 +127,7 @@ public class StudentAttendanceController {
 //        }
 //    }
 
+
     @PostMapping("/create")
     @Operation(summary = "创建学生请假记录")
     @PreAuthorize("@ss.hasPermission('system:student-attendance:create')")
@@ -136,6 +138,8 @@ public class StudentAttendanceController {
         createReqVO.setStudentName(student.getNickname());
         createReqVO.setUserNumber(student.getUserNumber());
         createReqVO.setDeptId(String.valueOf(student.getDeptId()));
+        createReqVO.setSupervisorId(student.getSupervisorId());//导师id
+        createReqVO.setClockInStatus("2");//请假
         return success(studentAttendanceService.createStudentAttendance(createReqVO));
     }
 

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

@@ -30,7 +30,7 @@ public class StudentAttendancePageReqVO extends PageParam {
     private String userNumber;
 
     @Schema(description = "日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate date;
 
     @Schema(description = "打卡状态 0正常，1未打卡、2警告、3已恢复", example = "1")

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

@@ -42,6 +42,7 @@ public class StudentAttendanceRespVO {
 
     @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate date;
 
     @Schema(description = "打卡时间")

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

@@ -29,7 +29,8 @@ public class StudentAttendanceSaveReqVO {
     private String deptId;
 
     @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "日期不能为空")
+//    @NotNull(message = "日期不能为空")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate date;
 
     @Schema(description = "打卡时间")
@@ -39,7 +40,7 @@ public class StudentAttendanceSaveReqVO {
     private String clockInStatus;
 
     @Schema(description = "备注原因", example = "你猜")
-    @NotEmpty(message = "请假原因不能为空")
+//    @NotEmpty(message = "请假原因不能为空")
     private String remark;
 
     @Schema(description = "学生学号", example = "3232")

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

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.user.vo.user;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -61,5 +62,8 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "导师名称")
     private String supervisor;
 
+    @Schema(description = "是否达成毕业条件")
+    private Long isGraduate;
+
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/SelfAchievementSaveReqVO.java

@@ -33,4 +33,7 @@ public class SelfAchievementSaveReqVO {
     @Schema(description = "工作间id")
     private Long dept_id;
 
+    @Schema(description = "署名")
+    private String sort;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementPageReqVO.java

@@ -21,7 +21,12 @@ public class UserAchievementPageReqVO extends PageParam {
     @Schema(description = "成果名称", example = "赵六")
     private String achievementName;
 
-    @Schema(description = "1论文，2专利，3著作", example = "2")
+    @Schema(description = "1.北大中文核心期刊论文" +
+            "2.SCI,EI,A&HCI国际学术期刊论文" +
+            "3.SCI,EI,ISIP会议论文" +
+            "4.专利" +
+            "5.著作" +
+            "6.竞赛", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")//
     private String achievementType;
 
     @Schema(description = "用户名称", example = "张三")
@@ -40,4 +45,7 @@ public class UserAchievementPageReqVO extends PageParam {
     @Schema(description = "用户类型")
     private List<String> userType;
 
+    @Schema(description = "署名")
+    private String sort;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementRespVO.java

@@ -13,31 +13,34 @@ import com.alibaba.excel.annotation.*;
 public class UserAchievementRespVO {
 
     @Schema(description = "自增id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7131")
-    @ExcelProperty("自增id")
     private Integer id;
 
     @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25783")
-    @ExcelProperty("用户id")
     private Long userId;
 
+    @Schema(description = "用户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("用户名称")
+    private String userName;
+
     @Schema(description = "成果名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
     @ExcelProperty("成果名称")
     private String achievementName;
 
     @Schema(description = "1论文，2专利，3著作", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("1论文，2专利，3著作")
+    @ExcelProperty("成果类型")
     private String achievementType;
 
-    @Schema(description = "用户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @ExcelProperty("用户名称")
-    private String userName;
+    @Schema(description = "照片详情")
+    @ExcelProperty("照片详情")
+    private String detail;
+
+    @Schema(description = "署名")
+    @ExcelProperty("署名")
+    private String sort;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "照片详情url")
-    @ExcelProperty("照片详情url")
-    private String detail;
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementSaveReqVO.java

@@ -20,7 +20,12 @@ public class UserAchievementSaveReqVO {
     @NotEmpty(message = "成果名称不能为空")
     private String achievementName;
 
-    @Schema(description = "1论文，2专利，3著作", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "1.北大中文核心期刊论文" +
+            "2.SCI,EI,A&HCI国际学术期刊论文" +
+            "3.SCI,EI,ISIP会议论文" +
+            "4.专利" +
+            "5.著作" +
+            "6.竞赛", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")//
     @NotEmpty(message = "成果类型不能为空")
     private String achievementType;
 
@@ -34,4 +39,9 @@ public class UserAchievementSaveReqVO {
     @Schema(description = "工作间id")
     private Long dept_id;
 
+    @NotEmpty(message = "署名不能为空")
+    @Schema(description ="署名")
+    private String sort;
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dept/DeptDO.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java

@@ -153,6 +153,9 @@ public class AdminUserDO extends TenantBaseDO {
     //0已达成，1未达成
     @TableField(exist = false)
     private Long isGraduate;
+
+    @TableField(exist = false)
+    private String deptName;
     
 
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/userAchievement/UserAchievementDO.java

@@ -36,7 +36,12 @@ public class UserAchievementDO extends BaseDO {
      */
     private String achievementName;
     /**
-     * 1论文，2专利，3著作
+     * 1.北大中文核心期刊论文
+     * 2.SCI,EI,A&HCI国际学术期刊论文
+     * 3.SCI,EI,ISIP会议论文
+     * 4.专利
+     * 5.著作
+     * 6.竞赛
      */
     private String achievementType;
     /**
@@ -53,6 +58,11 @@ public class UserAchievementDO extends BaseDO {
      */
     private String detail;
 
+    /**
+     *署名
+     */
+    private String sort;
+
     @TableField(exist = false)
     private String userType;
 

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

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqV
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -15,12 +16,17 @@ import java.util.List;
 public interface DeptMapper extends BaseMapperX<DeptDO> {
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
-        return selectList(new LambdaQueryWrapperX<DeptDO>()
-                .inIfPresent(DeptDO::getLeaderUserId, reqVO.getLeaderUserId())
-                .likeIfPresent(DeptDO::getPhone, reqVO.getPhone())//电话
+
+        LambdaQueryWrapperX<DeptDO> queryWrapperX =new LambdaQueryWrapperX<>();
+        queryWrapperX.likeIfPresent(DeptDO::getPhone, reqVO.getPhone())//电话
                 .likeIfPresent(DeptDO::getEmail,reqVO.getEmail())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
-                .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
+                .eqIfPresent(DeptDO::getStatus, reqVO.getStatus())
+                .likeIfPresent(DeptDO::getAddress,reqVO.getAddress());//地址
+        if (reqVO.getLeaderUserId() != null && !reqVO.getLeaderUserId().equals("")) {
+            queryWrapperX.apply("JSON_CONTAINS(leader_user_id, CAST({0} AS JSON))", reqVO.getLeaderUserId());
+        }
+        return selectList(queryWrapperX);
     }
     //获取登录人员工作间的信息
     default DeptDO selectLoginDept() {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/studentAttendance/StudentAttendanceMapper.java

@@ -70,7 +70,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapper = new MPJLambdaWrapperX<>();
 
         // 添加查询条件
-        queryWrapper.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
+        queryWrapper.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())//打卡时间
                 .eqIfPresent(StudentAttendanceDO::getDate,reqVO.getDate())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
@@ -83,7 +83,6 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                 .likeIfExists(AdminUserDO::getUserNumber, reqVO.getUserNumber())//按学号查
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-
                 .eqIfExists(StudentAttendanceDO::getRemark, reqVO.getRemark())
                 .orderByDesc(StudentAttendanceDO::getClockInTime);
 
@@ -118,6 +117,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
 
+
                 .eqIfExists(StudentAttendanceDO::getRemark, reqVO.getRemark())
                 .orderByDesc(StudentAttendanceDO::getClockInTime);
 
@@ -138,7 +138,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
 
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapperX =new MPJLambdaWrapperX<>();
 
-        queryWrapperX.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
+        queryWrapperX.betweenIfPresent(StudentAttendanceDO::getCreateTime,reqVO.getCreateTime())
                 .eqIfPresent(StudentAttendanceDO::getDate,reqVO.getDate())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
@@ -171,7 +171,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
 
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapperX =new MPJLambdaWrapperX<>();
 
-        queryWrapperX.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
+        queryWrapperX.betweenIfPresent(StudentAttendanceDO::getCreateTime,reqVO.getCreateTime())
                 .eqIfPresent(StudentAttendanceDO::getDate,reqVO.getDate())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
@@ -204,7 +204,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
         // 创建查询包装器
         MPJLambdaWrapperX<StudentAttendanceDO> queryWrapper = new MPJLambdaWrapperX<>();
         // 添加查询条件
-        queryWrapper.betweenIfPresent(StudentAttendanceDO::getClockInTime,reqVO.getCreateTime())
+        queryWrapper.betweenIfPresent(StudentAttendanceDO::getCreateTime,reqVO.getCreateTime())
                 .eqIfPresent(StudentAttendanceDO::getDate,reqVO.getDate())
                 .selectAll(StudentAttendanceDO.class)
                 .selectAs(DeptDO::getName, StudentAttendanceDO::getDeptName)
@@ -218,7 +218,7 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
                 .eqIfExists(StudentAttendanceDO::getRemark, reqVO.getRemark())
-                .orderByDesc(StudentAttendanceDO::getClockInTime);
+                .orderByDesc(StudentAttendanceDO::getCreateTime);
 
         if (roleIds != null && !roleIds.isEmpty()) {
             if (roleIds.contains(113L)) {//是教师

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -102,12 +102,14 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
                 .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())//昵称查询
                 .eqIfPresent(AdminUserDO::getUserType,reqVO.getUserType())//类型查询
+                .eqIfPresent(AdminUserDO::getIsGraduate,reqVO.getIsGraduate())//是否达成毕业条件
                 .likeIfPresent(AdminUserDO::getGrade, reqVO.getGrade())//班级查询
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .orderByDesc(AdminUserDO::getId);
 
+
         if (roleIds.contains(113L)){//如果是教师,只找导师是登录的
             queryWrapperX.eqIfPresent(AdminUserDO::getSupervisorId,loginId)
                           .eqIfPresent(AdminUserDO::getUserType,1);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userAchievement/UserAchievementMapper.java

@@ -35,6 +35,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
                 .likeIfExists(UserAchievementDO::getUserName, reqVO.getUserName())
                 .eqIfExists(UserAchievementDO::getDetail, reqVO.getDetail())
+                .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
 
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 //用户类型查
@@ -56,6 +57,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
                 .likeIfExists(UserAchievementDO::getUserName, reqVO.getUserName())
                 .eqIfExists(UserAchievementDO::getDetail, reqVO.getDetail())
+                .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 //用户类型查
                 .orderByDesc(UserAchievementDO::getCreateTime);

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

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.studentAttendance;
 
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +35,8 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
     private StudentAttendanceMapper studentAttendanceMapper;
     @Resource
     private PermissionService permissionService;
+    @Resource
+    private AdminUserService adminUserService;
 
     @Override
     public Integer createStudentAttendance(StudentAttendanceSaveReqVO createReqVO) {
@@ -84,14 +87,33 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
     public PageResult<StudentAttendanceDO> getStudentAttendancePage(StudentAttendancePageReqVO pageReqVO) {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return studentAttendanceMapper.selectPage(pageReqVO,roleIds,loginId);
+        PageResult<StudentAttendanceDO> result = studentAttendanceMapper.selectPage(pageReqVO,roleIds,loginId);
+        result.getList().stream().forEach(attendanceDO-> {
+            if (attendanceDO.getSupervisorId()!=null){
+                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+            }
+            if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
+                attendanceDO.setDeptName("测绘学院");
+            }
+        });
+        return result;
     }
 
     @Override//
     public List<StudentAttendanceDO> getStudentAttendanceList(StudentAttendancePageReqVO pageReqVO) {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return studentAttendanceMapper.selectList(pageReqVO,roleIds,loginId);
+
+        List<StudentAttendanceDO> result = studentAttendanceMapper.selectList(pageReqVO,roleIds,loginId);
+        result.stream().forEach(attendanceDO-> {
+            if (attendanceDO.getSupervisorId()!=null){
+                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+            }
+            if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
+                attendanceDO.setDeptName("测绘学院");
+            }
+        });
+        return result;
     }
 
 
@@ -100,21 +122,51 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
     public PageResult<StudentAttendanceDO> getStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO) {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return studentAttendanceMapper.selectErrorPage(pageReqVO,roleIds,loginId);
+
+        PageResult<StudentAttendanceDO> result = studentAttendanceMapper.selectErrorPage(pageReqVO,roleIds,loginId);
+        result.getList().stream().forEach(attendanceDO-> {
+            if (attendanceDO.getSupervisorId()!=null){
+                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+            }
+            if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
+                attendanceDO.setDeptName("测绘学院");
+            }
+        });
+        return result;
     }
 
     @Override
     public List<StudentAttendanceDO> getStudentAttendanceErrorList(StudentAttendancePageReqVO pageReqVO) {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return studentAttendanceMapper.selectErrorList(pageReqVO,roleIds,loginId);
+
+        List<StudentAttendanceDO> result =studentAttendanceMapper.selectErrorList(pageReqVO,roleIds,loginId);
+
+        result.stream().forEach(attendanceDO-> {
+            if (attendanceDO.getSupervisorId()!=null){
+                attendanceDO.setSupervisor(adminUserService.getUser(attendanceDO.getSupervisorId()).getNickname());
+            }
+            if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
+                attendanceDO.setDeptName("测绘学院");
+            }
+        });
+        return result;
     }
 
     @Override
     public PageResult<StudentAttendanceDO> getStudentAttendanceExcusedPage(StudentAttendancePageReqVO pageReqVO){
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return studentAttendanceMapper.selectExcusedPage(pageReqVO,roleIds,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());
+            }
+            if (attendanceDO.getDeptId()==null||attendanceDO.getDeptId()==0L){
+                attendanceDO.setDeptName("测绘学院");
+            }
+        });
+        return result;
     }
 
    public StudentAttendanceDO getStudentAttendanceOne(String userNumber, LocalDateTime clockTime){

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

@@ -43,6 +43,7 @@ import javax.validation.ConstraintViolationException;
 import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -351,7 +352,11 @@ public class AdminUserServiceImpl implements AdminUserService {
         result.getList().stream().forEach(user -> {
             user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
             user.setIsGraduate(vilidateIsGraduate(user));
+            if (user.getDeptId()==null||user.getDeptId()==0L){
+                user.setDeptName("测绘学院");
+            }
         });
+
         System.out.println(result);
         return result;
     }
@@ -366,15 +371,29 @@ public class AdminUserServiceImpl implements AdminUserService {
             user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
             user.setIsGraduate(vilidateIsGraduate(user));
         });
+        // 在查询结果返回后，手动过滤
+//        if (reqVO.getIsGraduate()!=null) {
+//            result = result.stream()
+//                    .filter(user -> vilidateIsGraduate(user).equals(reqVO.getIsGraduate()))
+//                    .collect(Collectors.toList());
+//        }
         System.out.println(result);
         return result;
     };
     //lsq 根据登录查所有老师
     @Override
     public PageResult<AdminUserDO> getUserPage0(UserPageReqVO reqVO) {
+
+
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return userMapper.selectPage0(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,loginId);
+        PageResult<AdminUserDO> result =userMapper.selectPage0(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,loginId);
+        result.getList().stream().forEach(user -> {
+            if (user.getDeptId()==null||user.getDeptId()==0L){
+                user.setDeptName("测绘学院");
+            }
+        });
+        return result;
     }
 
     //查询工作间下的人员