部分代码审计

yudao-module-system/yudao-module-system-biz/pom.xml

@@ -16,6 +16,13 @@
         system 模块下，我们放通用业务，支撑上层的核心业务。
         例如说：用户、部门、权限、数据字典等等
     </description>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 
     <dependencies>
         <dependency>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java

@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.mail.MailSendService;
 import cn.iocoder.yudao.module.system.service.mail.MailTemplateService;
+import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.studentAttendance.StudentAttendanceService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -29,10 +30,7 @@ import javax.validation.Valid;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAdjusters;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -52,6 +50,8 @@ public class MailTemplateController {
     private StudentAttendanceService studentAttendanceService;
     @Resource
     private DeptService deptService;
+    @Resource
+    private PermissionService permissionService;
 
     @Scheduled(cron = "0 30 22 * * ?") // 每天晚上 22:30
     @Operation(summary = "定时发送邮件给导师")
@@ -124,74 +124,7 @@ public class MailTemplateController {
     @Scheduled(cron = "0 30 22 * * ?") // 每天晚上 22:30
     @Operation(summary = "定时发送邮件给学院")
     public void sendMailToCollegeScheduled() {
-        UserPageReqVO reqVO = new UserPageReqVO();
-        reqVO.setUserType("4");//找学院
-        List<AdminUserDO> collegeList = adminUserService.getUserList(reqVO);
-        StudentAttendancePageReqVO attendanceReqVO =new StudentAttendancePageReqVO();
-        Map<String, Object> templateParams =new HashMap<>();//模板参数设置
-        // 获取当前这天
-        LocalDate today = LocalDate.now();
-        if ( collegeList!=null&& !collegeList.isEmpty()) {
-            for (AdminUserDO college : collegeList) {
-                attendanceReqVO.setDate(today);
-                List<StudentAttendanceEmailVO> normalList = BeanUtils.toBean(
-                        studentAttendanceService.getStudentAttendanceListForTeacher(attendanceReqVO),
-                        StudentAttendanceEmailVO.class
-                );
-                List<StudentAttendanceEmailVO> errorList = BeanUtils.toBean(
-                        studentAttendanceService.getStudentAttendanceErrorListForTeacher(attendanceReqVO),
-                        StudentAttendanceEmailVO.class
-                );
-                List<StudentAttendanceEmailVO> excusedList = BeanUtils.toBean(//请假
-                        studentAttendanceService.getStudentAttendanceExcusedListForTeacher(attendanceReqVO),
-                        StudentAttendanceEmailVO.class
-                );
-
-                StringBuilder normalListBuilder = new StringBuilder();
-                for (StudentAttendanceEmailVO attendance : normalList) {
-                    normalListBuilder
-                            .append(", 学生姓名: ").append(attendance.getStudentName())
-                            .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                            .append(", 工作间名称: ").append(attendance.getDeptName()!=null?attendance.getDeptName():"无")
-                            .append(",导师名称：").append(attendance.getSupervisor()!=null ? attendance.getSupervisor():"无" )
-                            .append(", 日期: ").append(attendance.getDate())
-                            .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "未打卡")
-                            .append("<br/>");
-                }
-
-                StringBuilder errorListBuilder = new StringBuilder();
-                for (StudentAttendanceEmailVO attendance : errorList) {
-                    errorListBuilder
-                            .append(", 学生姓名: ").append(attendance.getStudentName())
-                            .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                            .append(", 工作间名称: ").append(attendance.getDeptName()!=null?attendance.getDeptName():"无")
-                            .append(",导师名称：").append(attendance.getSupervisor()!=null ? attendance.getSupervisor():"无" )
-                            .append(", 日期: ").append(attendance.getDate())
-                            .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "未打卡")
-                            .append("<br/>");
-                }
-
-                StringBuilder excusedListBuilder = new StringBuilder();
-                for (StudentAttendanceEmailVO attendance : excusedList) {
-                    excusedListBuilder
-                            .append(", 学生姓名: ").append(attendance.getStudentName())
-                            .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                            .append(", 工作间名称: ").append(attendance.getDeptName()!=null?attendance.getDeptName():"无")
-                            .append(",导师名称：").append(attendance.getSupervisor()!=null ? attendance.getSupervisor():"无" )
-                            .append(", 日期: ").append(attendance.getDate())
-                            .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "请假")
-                            .append("<br/>");
-                }
-
-                templateParams.put("normalList", normalListBuilder.toString());
-                templateParams.put("errorList", errorListBuilder.toString());
-                templateParams.put("excusedList", excusedListBuilder.toString());
-                if (college.getEmail() != null) {
-                    mailSendService.sendSingleMailToMember(college.getEmail(), null, "attendance-list", templateParams);
-                }
-            }
-        }
-
+        testCollege();
     }
 
 
@@ -257,6 +190,7 @@ public class MailTemplateController {
     public void testTeacher() {
         // 创建结果对象并设置属性
         UserPageReqVO reqVO = new UserPageReqVO();
+
         reqVO.setUserType("3");//找导师
         List<AdminUserDO> TeacherList = adminUserService.getUserList(reqVO);
         StudentAttendancePageReqVO pageReqVO =new StudentAttendancePageReqVO();
@@ -324,13 +258,25 @@ public class MailTemplateController {
     @Operation(summary = "定时发送邮件给学院")
     public void testCollege() {
         UserPageReqVO reqVO = new UserPageReqVO();
-        reqVO.setUserType("4");//找学院
-        List<AdminUserDO> collegeList = adminUserService.getUserList(reqVO);
+        Set<Long> collegeIdList =  permissionService.getUserListByRoleId(114L);
+
+        Set<AdminUserDO> collegeList  = new HashSet<>();
+        List<AdminUserDO> collegeList1 = adminUserService.getUserList(collegeIdList);
+        reqVO.setUserType("4");
+        List<AdminUserDO> collegeList2 = adminUserService.getUserList(reqVO);
+
+        collegeList.addAll(collegeList1);
+        collegeList.addAll(collegeList2);
+
+       //找学院
+
         StudentAttendancePageReqVO attendanceReqVO =new StudentAttendancePageReqVO();
+
         Map<String, Object> templateParams =new HashMap<>();//模板参数设置
+
         // 获取当前这天
         LocalDate today = LocalDate.now();
-        if ( collegeList!=null&& !collegeList.isEmpty()) {
+        if ( collegeList!=null && !collegeList.isEmpty()) {
             for (AdminUserDO college : collegeList) {
                 attendanceReqVO.setDate(today);
                 List<StudentAttendanceEmailVO> normalList = BeanUtils.toBean(

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

@@ -15,7 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
+import java.time.DayOfWeek;
+import java.time.LocalDate;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.time.LocalDate;
@@ -67,14 +68,15 @@ public class StudentAttendanceController {
     @Scheduled(cron = "0 00 00 * * ?") // 每天0:00检测，更新未打卡
     @Idempotent(timeout = 10)
     public void attendanceNormalFirst() {
-        checkAttendanceFirst();
+        LocalDate today = LocalDate.now();
+        DayOfWeek dayOfWeek = today.getDayOfWeek();
+        if( !(dayOfWeek == DayOfWeek.SATURDAY || dayOfWeek == DayOfWeek.SUNDAY)){
+            checkAttendanceFirst();
+        }else {
+            System.out.println("今天是周末，不检测");
+        }
     }
 
-//    @Scheduled(cron = "0 0/1 * * * ?") // 每10分钟执行一次
-//    public void attendanceNormalFirst() {
-//        checkAttendanceFirst();
-//    }
-
     @GetMapping("/test")
     @Idempotent(timeout = 10)
     public void checkAttendanceFirst() {

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

@@ -181,6 +181,22 @@ public class UserController {
                 pageResult.getTotal()));
     }
 
+    @GetMapping("/getTeacherPageForTeacher")
+    @Operation(summary = "获得老师分页列表")
+    @PreAuthorize("@ss.hasPermission('system:user:teacherList')")
+    public CommonResult<PageResult<UserRespVO>> getTeacherPageForTeacher(@Valid UserPageReqVO pageReqVO) {
+        // 获得用户分页列表
+        PageResult<AdminUserDO> pageResult = userService.getTeacherPageForTeacher(pageReqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
+        // 拼接数据
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(pageResult.getList(), AdminUserDO::getDeptId));
+        return success(new PageResult<>(UserConvert.INSTANCE.convertList(pageResult.getList(), deptMap),
+                pageResult.getTotal()));
+    }
+
     //lsq
     @GetMapping("/page1")
     @Operation(summary = "获得学生分页列表")
@@ -201,7 +217,24 @@ public class UserController {
         return success(new PageResult<>(userRespList, pageResult.getTotal()));
     }
 
+    @GetMapping("/pageForTeacher")
+    @Operation(summary = "教师获得学生分页")
+    @PreAuthorize("@ss.hasPermission('system:user:studentList')")
+    public CommonResult<PageResult<UserRespVO>> getUserPageForTeacher(@Valid UserPageReqVO pageReqVO) {
+        // 获得用户分页列表
+        PageResult<AdminUserDO> pageResult = userService.getUserPageForTeacher(pageReqVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
 
+        // 拼接部门信息
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(pageResult.getList(), AdminUserDO::getDeptId));
+
+        // 转换用户数据并返回结果
+        List<UserRespVO> userRespList = UserConvert.INSTANCE.convertList(pageResult.getList(), deptMap);
+        return success(new PageResult<>(userRespList, pageResult.getTotal()));
+    }
     //lsq
     @GetMapping("/DeptUser")
     @Operation(summary = "获得工作间人员")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/UserRoleMapper.java

@@ -15,6 +15,9 @@ public interface UserRoleMapper extends BaseMapperX<UserRoleDO> {
         return selectList(UserRoleDO::getUserId, userId);
     }
 
+    default List<UserRoleDO> selectListByRoleId(Long roleId) {
+        return selectList(UserRoleDO::getRoleId, roleId);
+    }
     default void deleteListByUserIdAndRoleIdIds(Long userId, Collection<Long> roleIds) {
         delete(new LambdaQueryWrapper<UserRoleDO>()
                 .eq(UserRoleDO::getUserId, userId)

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

@@ -245,8 +245,6 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                 .likeIfExists(DeptDO::getName,reqVO.getDeptName())//工作间名称
                 .eqIfExists(StudentAttendanceDO::getSupervisorId,reqVO.getSupervisorId())//导师查
                 .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
-                .eqIfExists(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-                .eqIfExists(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
                 //1未打卡
                 .eqIfExists(StudentAttendanceDO::getClockInStatus,"1")
                 .orderByDesc(StudentAttendanceDO::getDate);//未打卡

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

@@ -88,9 +88,11 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 // 添加子查询条件，查找有教师权限的人
                 .eqIfPresent(AdminUserDO::getUserType,3)
                 .orderByDesc(AdminUserDO::getId);
-        if (roleIds.contains(113L)){//如果是教师,只找导师工作间下的
+        if (roleIds.contains(114L)) {//学院
+
+        } else if (roleIds.contains(113L)){//如果是教师,只找导师工作间下的
+
             queryWrapperX.eqIfPresent(AdminUserDO::getDeptId,deptId);
-        }else if (roleIds.contains(114L)) {//学院
 
         }else if (roleIds.contains(1L)){//管理员
 
@@ -98,19 +100,43 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return selectPage(reqVO,queryWrapperX);
     }
 
-    List<AdminUserDO> selectPage1(
+    default PageResult<AdminUserDO> getTeacherPageForTeacher(UserPageReqVO reqVO, Collection<Long> deptIds,Set<Long>roleIds,Long loginId) {
+        Long deptId =SecurityFrameworkUtils.getLoginUserDeptId();
+        LambdaQueryWrapperX<AdminUserDO> queryWrapperX =new LambdaQueryWrapperX<AdminUserDO>();
+        queryWrapperX
+                .likeIfPresent(AdminUserDO::getEmail,reqVO.getEmail())
+                .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+                .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
+                .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
+                .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(AdminUserDO::getUserType,reqVO.getUserType())//类型查询
+                .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
+                .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
+                .inIfPresent(AdminUserDO::getDeptId, deptIds)
+                // 添加子查询条件，查找有教师权限的人
+                .eqIfPresent(AdminUserDO::getUserType,3)
+                .orderByDesc(AdminUserDO::getId);
+
+        queryWrapperX.eqIfPresent(AdminUserDO::getDeptId,deptId);
+
+        return selectPage(reqVO,queryWrapperX);
+    }
+
+    List<AdminUserDO> selectPageForGraduate(
             @Param("reqVO") UserPageReqVO reqVO,
             @Param("deptIds") Collection<Long> deptIds,
             @Param("roleIds") Set<Long> roleIds,
             @Param("deptId") Long deptId,
-            @Param("offset") Integer offset
+            @Param("offset") Integer offset,
+            @Param("type") Integer type
     );
     Long  selectPage1Count(
             @Param("reqVO") UserPageReqVO reqVO,
             @Param("deptIds") Collection<Long> deptIds,
             @Param("roleIds") Set<Long> roleIds,
             @Param("deptId") Long deptId,
-            @Param("offset") Integer offset
+            @Param("offset") Integer offset,
+            @Param("type") Integer type
     );
     // 会根据登录 查在校学生
 //    default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds,Set<Long>roleIds,Long loginId) {
@@ -204,10 +230,10 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .likeIfPresent(AdminUserDO::getMajor, reqVO.getMajor())//专业
                 .likeIfPresent(AdminUserDO::getMasterType, reqVO.getMasterType())//专硕
                 .orderByDesc(AdminUserDO::getId);
-        if (roleIds.contains(113L)){//如果是教师
-            queryWrapper.eqIfPresent(AdminUserDO::getSupervisorId,loginId);
-        }else if (roleIds.contains(114L)) {//学院
+        if (roleIds.contains( 114L)){//如果是教师
 
+        }else if (roleIds.contains(113L)) {//学院
+            queryWrapper.eqIfPresent(AdminUserDO::getSupervisorId,loginId);
         }else if (roleIds.contains(1L)){//管理员
 
         }
@@ -291,9 +317,20 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     @Select("SELECT u.* " +
             "FROM system_users u " +
             "JOIN system_student_attendance sa ON u.id = sa.student_id " +
+            "JOIN ( " +
+            "    SELECT date " +
+            "    FROM ( " +
+            "        SELECT CURDATE() - INTERVAL seq DAY AS date " +
+            "        FROM ( " +
+            "            SELECT 0 AS seq UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 " +
+            "        ) AS seq " +
+            "    ) AS dates " +
+            "    WHERE DAYOFWEEK(date) NOT IN (1, 7) " +
+            "    ORDER BY date DESC " +
+            "    LIMIT 3 " +
+            ") AS recent_dates ON sa.date = recent_dates.date " +
             "WHERE u.user_type = 1 " +
             "AND sa.clock_in_status = 1 " +
-            "AND sa.date >= CURDATE() - INTERVAL 2 DAY " +
             "GROUP BY u.id " +
             "HAVING COUNT(sa.id) > 2;")
     List<AdminUserDO> getStudentErrorAttendance();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java

@@ -116,6 +116,15 @@ public interface PermissionService {
      */
     Set<Long> getUserRoleIdListByUserId(Long userId);
 
+
+    /**
+     * 获得用户拥有的角色编号集合
+     *
+     * @param roleId 用户编号
+     * @return 角色编号集合
+     */
+    Set<Long> getUserListByRoleId(Long roleId);
+
     /**
      * 获得用户拥有的角色编号集合，从缓存中获取
      *

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java

@@ -234,6 +234,12 @@ public class PermissionServiceImpl implements PermissionService {
         return convertSet(userRoleMapper.selectListByUserId(userId), UserRoleDO::getRoleId);
     }
 
+    @Override
+    public Set<Long> getUserListByRoleId(Long roleId) {
+        return convertSet(userRoleMapper.selectListByRoleId(roleId), UserRoleDO::getUserId);
+    }
+
+
     @Override
     @Cacheable(value = RedisKeyConstants.USER_ROLE_ID_LIST, key = "#userId")
     public Set<Long> getUserRoleIdListByUserIdFromCache(Long userId) {

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

@@ -118,10 +118,14 @@ public interface AdminUserService {
     //lsq 0老师 1学生
     PageResult<AdminUserDO> getUserPage1(UserPageReqVO reqVO);
 
+    PageResult<AdminUserDO> getUserPageForTeacher(UserPageReqVO reqVO);
+
     List<AdminUserDO> getUserList1(UserPageReqVO reqVO);
 //    1学生
     PageResult<AdminUserDO> getUserPage0(UserPageReqVO reqVO);
 
+    PageResult<AdminUserDO> getTeacherPageForTeacher(UserPageReqVO reqVO);
+
     //查工作间下的所有人
     List<AdminUserDO> getDeptUser(UserPageReqVO reqVO);
 

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

@@ -385,7 +385,6 @@ public class AdminUserServiceImpl implements AdminUserService {
 
     //<>
     //lsq 根据登录人权限查学生
-    @Override
     public PageResult<AdminUserDO> getUserPage1(UserPageReqVO reqVO) {//(学院)
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
@@ -397,8 +396,8 @@ public class AdminUserServiceImpl implements AdminUserService {
             offset = (reqVO.getPageNo() - 1) * reqVO.getPageSize();
         }
 
-        List<AdminUserDO> result =userMapper.selectPage1(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId,offset);
-        Long size = userMapper.selectPage1Count(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,loginId,offset);
+        List<AdminUserDO> result =userMapper.selectPageForGraduate(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId,offset,0);
+        Long size = userMapper.selectPage1Count(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId,offset,0);
 
         // 遍历结果集，设置 photoIsExist
 //        resultPage.getList().stream().forEach(user -> {
@@ -427,7 +426,22 @@ public class AdminUserServiceImpl implements AdminUserService {
         return new PageResult<>(result, size);
     }
 
+    public PageResult<AdminUserDO> getUserPageForTeacher(UserPageReqVO reqVO) {//(学院)
+        Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
+        int offset;
+        if (reqVO.getPageSize() == -1) {
+            offset =-1;  //
+        } else {
+            offset = (reqVO.getPageNo() - 1) * reqVO.getPageSize();
+        }
+
+        List<AdminUserDO> result =userMapper.selectPageForGraduate(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId,offset,1);
+        Long size = userMapper.selectPage1Count(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId,offset,1);
 
+        return new PageResult<>(result, size);
+    }
     @Override
     public  List<AdminUserDO> getUserList1(UserPageReqVO reqVO){
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
@@ -457,6 +471,24 @@ public class AdminUserServiceImpl implements AdminUserService {
         return result;
     }
 
+    @Override
+    public PageResult<AdminUserDO> getTeacherPageForTeacher(UserPageReqVO reqVO) {
+
+        Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
+        PageResult<AdminUserDO> result =userMapper.getTeacherPageForTeacher(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,loginId);
+        result.getList().forEach(user -> {
+            if (user.getDeptId()==null||user.getDeptId()==0L){
+                user.setDeptName("测绘学院");
+            }else {
+                DeptDO dept =deptService.getDept(user.getDeptId());
+                if (dept!=null){
+                    user.setDeptName(dept.getName());
+                }
+            }
+        });
+        return result;
+    }
     //查询工作间下的人员
     @Override
     public List<AdminUserDO> getDeptUser(UserPageReqVO reqVO) {

yudao-module-system/yudao-module-system-biz/src/main/resources/Mapper/AdminUserMapper/AdminUserMapper.xml → yudao-module-system/yudao-module-system-biz/src/main/resources/Mapper/user/AdminUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper">
-    <select id="selectPage1" resultType="cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO">
+    <select id="selectPageForGraduate" resultType="cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO">
         SELECT
         a.*,
         COALESCE(
@@ -73,16 +73,15 @@
                 #{deptId}
             </foreach>
         </if>
-        <if test="roleIds != null and roleIds.contains(113L)">
-            AND a.dept_id = #{deptId}
-            AND a.user_type = 1
-        </if>
-        <if test="roleIds != null and roleIds.contains(114L)">
-            AND a.user_type = 1
-        </if>
-        <if test="roleIds != null and roleIds.contains(1L)">
-            AND a.user_type IN (1, 2)
-        </if>
+        <choose>
+            <when test="type == 0">
+                AND a.user_type = 1
+            </when>
+            <when test="type == 1">
+                AND a.dept_id = #{deptId}
+                AND a.user_type = 1
+            </when>
+        </choose>
         <if test="reqVO.isGraduate != null">
             <if test="reqVO.isGraduate == 1">
                 AND a.id NOT IN (SELECT user_id FROM system_user_achievement WHERE user_id = a.id AND is_graduate = 0)
@@ -164,16 +163,15 @@
                 #{deptId}
             </foreach>
         </if>
-        <if test="roleIds != null and roleIds.contains(113L)">
-            AND a.dept_id = #{deptId}
-            AND a.user_type = 1
-        </if>
-        <if test="roleIds != null and roleIds.contains(114L)">
-            AND a.user_type = 1
-        </if>
-        <if test="roleIds != null and roleIds.contains(1L)">
-            AND a.dept_id IN (1, 2)
-        </if>
+        <choose>
+            <when test="type == 0">
+                AND a.user_type = 1
+            </when>
+            <when test="type == 1">
+                AND a.dept_id = #{deptId}
+                AND a.user_type = 1
+            </when>
+        </choose>
         <if test="reqVO.isGraduate != null">
             <if test="reqVO.isGraduate == 1">
                 AND a.id NOT IN (SELECT user_id FROM system_user_achievement WHERE user_id = a.id AND is_graduate = 0)

yudao-server/src/main/resources/application.yaml

@@ -108,7 +108,7 @@ aj:
     cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存
     timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
     type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
-    water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
+    water-mark: 研究生系统 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode
     interference-options: 0 # 滑动干扰项(0/1/2)
     req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
     req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定