10.29

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

@@ -176,35 +176,6 @@ public class StudentAttendanceController {
                         BeanUtils.toBean(list, StudentAttendanceRespVO.class));
     }
 
-    @GetMapping("/selfPage")
-    @Operation(summary = "获得学生自己的考勤记录分页")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:SelfQuery')")
-    public CommonResult<PageResult<StudentAttendanceRespVO>> getStudentAttendanceSelfPage(@Valid StudentAttendancePageReqVO pageReqVO) {
-        PageResult<StudentAttendanceDO> pageResult = studentAttendanceService.getStudentAttendanceSelfPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, StudentAttendanceRespVO.class));
-    }
-
-    @GetMapping("/collegePage")
-    @Operation(summary = "学院获得学生考勤记录分页")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:college-query')")
-    public CommonResult<PageResult<StudentAttendanceRespVO>> collegeGetStudentAttendancePage(@Valid StudentAttendancePageReqVO pageReqVO) {
-
-        PageResult<StudentAttendanceDO> pageResult = studentAttendanceService.collegeGetStudentAttendancePage(pageReqVO);
-
-        return success(BeanUtils.toBean(pageResult, StudentAttendanceRespVO.class));
-    }
-
-    @GetMapping("/collegeErrorPage")
-    @Operation(summary = "学院获得学生考勤异常记录分页")
-    @PreAuthorize("@ss.hasPermission('system:student-attendance:college-ErrorQuery')")
-    public CommonResult<PageResult<StudentAttendanceRespVO>> collegeGetStudentAttendanceErrorPage(@Valid StudentAttendancePageReqVO pageReqVO) {
-
-        PageResult<StudentAttendanceDO> pageResult = studentAttendanceService.collegeGetStudentAttendanceErrorPage(pageReqVO);
-
-        return success(BeanUtils.toBean(pageResult, StudentAttendanceRespVO.class));
-    }
-
-
     @GetMapping("/dayAttendance")
     @Operation(summary = "获得所有人当日出勤列表")
     @PreAuthorize("@ss.hasPermission('system:student-attendance:day')")

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

@@ -141,6 +141,7 @@ public class UserController {
     }
 
     //lsq
+    //TODO这个如果给教师系统管理里面的学生用户，也只能看到自己下面的学生
     @GetMapping("/page1")
     @Operation(summary = "获得学生分页列表")
     @PreAuthorize("@ss.hasPermission('system:user:studentList')")
@@ -208,9 +209,9 @@ public class UserController {
         return success(deptUser);
     }
 
-    //lsq学院
+    //lsq学院和导师
     @GetMapping("/graduateStudentPage")
-    @Operation(summary = "学院获得毕业生分页列表")
+    @Operation(summary = "根据登录人获得毕业生分页列表")
     @PreAuthorize("@ss.hasPermission('system:user:graduateStudentList')")
     public CommonResult<PageResult<UserRespVO>> getGraduateStudentPage(@Valid UserPageReqVO pageReqVO) {
         // 获得用户分页列表
@@ -238,31 +239,7 @@ public class UserController {
                 pageResult.getTotal()));
     }
 
-    //lsq导师
-    @GetMapping("/graduateStudentTPage")
-    @Operation(summary = "导师获得毕业生分页列表")
-    @PreAuthorize("@ss.hasPermission('system:user:graduateStudentTList')")
-    public CommonResult<PageResult<UserRespVO>> getGraduateStudentTPage(@Valid UserPageReqVO pageReqVO) {
-        PageResult<AdminUserDO> pageResult = userService.getGraduateStudentTPage(pageReqVO);
-        for (AdminUserDO student : pageResult.getList()) {
-            if (student.getSupervisorId() != null) {
-                AdminUserDO supervisorUser = userService.getUser(student.getSupervisorId());
-                String supervisor = supervisorUser.getNickname();
-                String mobile = supervisorUser.getMobile();
 
-                student.setSupervisor(supervisor);
-                student.setSupervisorMobile(mobile);
-            }
-        }
-        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()));
-    }
 
     @GetMapping({"/list-all-simple", "/simple-list"})
     @Operation(summary = "获取用户精简信息列表", description = "只包含被开启的用户，主要用于前端的下拉选项")

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

@@ -28,9 +28,11 @@ import java.util.List;
 @Mapper
 public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO> {
 
-    //导师下全部
+    //根据登录人员不同显示全部考勤记录
     default PageResult<StudentAttendanceDO> selectPage(StudentAttendancePageReqVO reqVO) {
         Long dept_id = SecurityFrameworkUtils.getLoginUserDeptId();
+        Long loginId =SecurityFrameworkUtils.getLoginUserId();
+        List<Long> roleIds =selectUserRoleId(loginId);
         // 创建查询包装器
         LambdaQueryWrapperX<StudentAttendanceDO> queryWrapper = new LambdaQueryWrapperX<>();
 
@@ -42,85 +44,49 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
                 .eqIfPresent(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
                 .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(StudentAttendanceDO::getRemark, reqVO.getRemark())
-                // 只出现在老师工作间下面的学生考勤情况
-                .eqIfPresent(StudentAttendanceDO::getDeptId, dept_id)
                 .orderByDesc(StudentAttendanceDO::getClockInTime);
-        return selectPage(reqVO, queryWrapper);
-    }
 
-    //学院下全部学生考勤
-    default PageResult<StudentAttendanceDO> collegeSelectPage(StudentAttendancePageReqVO reqVO) {
-        // 创建查询包装器
-        LambdaQueryWrapperX<StudentAttendanceDO> queryWrapper = new LambdaQueryWrapperX<>();
-        // 添加查询条件
-        queryWrapper.eqIfPresent(StudentAttendanceDO::getStudentId, reqVO.getStudentId())
-                .likeIfPresent(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
-                .eqIfPresent(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
-                .betweenIfPresent(StudentAttendanceDO::getDate, reqVO.getDate())
-                .eqIfPresent(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-                .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(StudentAttendanceDO::getRemark, reqVO.getRemark())
-                .orderByDesc(StudentAttendanceDO::getClockInTime);
-        return selectPage(reqVO, queryWrapper);
-    }
-    //学院下全部学生考勤异常
-    default PageResult<StudentAttendanceDO> collegeSelectErrorPage(StudentAttendancePageReqVO reqVO) {
-        // 创建查询包装器
-        LambdaQueryWrapperX<StudentAttendanceDO> queryWrapper = new LambdaQueryWrapperX<>();
-        // 添加查询条件
-        queryWrapper.eqIfPresent(StudentAttendanceDO::getStudentId, reqVO.getStudentId())
-                .likeIfPresent(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
-                .eqIfPresent(StudentAttendanceDO::getDeptId, reqVO.getDeptId())
-                .betweenIfPresent(StudentAttendanceDO::getDate, reqVO.getDate())
-                .eqIfPresent(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-                .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(StudentAttendanceDO::getRemark, reqVO.getRemark())
-                //1未打卡，2警告
-                .in(StudentAttendanceDO::getClockInStatus, Arrays.asList(1, 2))
-                .orderByDesc(StudentAttendanceDO::getClockInTime);
+        if (roleIds.contains(113L)){//是教师 只出现在老师工作间下面的学生考勤情况
+            queryWrapper.eqIfPresent(StudentAttendanceDO::getDeptId,dept_id);
+        }else if (roleIds.contains(112L)){//是学生，只显示自己的
+            queryWrapper.eqIfPresent(StudentAttendanceDO::getStudentId, loginId);
+        }
         return selectPage(reqVO, queryWrapper);
     }
 
-    //导师下
+    //异常考勤记录
     default PageResult<StudentAttendanceDO> selectErrorPage(StudentAttendancePageReqVO reqVO) {
         Long dept_id = SecurityFrameworkUtils.getLoginUserDeptId();
-
+        Long loginId =SecurityFrameworkUtils.getLoginUserId();
+        List<Long> roleIds =selectUserRoleId(loginId);
         LambdaQueryWrapperX<StudentAttendanceDO> queryWrapperX =new LambdaQueryWrapperX<>();
-         return selectPage(reqVO, queryWrapperX
-                 .likeIfPresent(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
-                 .betweenIfPresent(StudentAttendanceDO::getDate, reqVO.getDate())
-                 .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
-                 .eqIfPresent(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
-                 // 只出现在老师工作间下面的学生考勤情况
-                 .eqIfPresent(StudentAttendanceDO::getDeptId, dept_id)
-                 //1未打卡，2警告
-                 .in(StudentAttendanceDO::getClockInStatus, Arrays.asList(1, 2))
-                 .orderByDesc(StudentAttendanceDO::getClockInTime));
-    }
-
-    //自己全部(先展示未打卡的，再按时间分布)
-    default PageResult<StudentAttendanceDO> selectSelfPage(StudentAttendancePageReqVO reqVO) {
-        Long loginId = SecurityFrameworkUtils.getLoginUserId();
 
-        LambdaQueryWrapperX<StudentAttendanceDO> queryWrapperX = new LambdaQueryWrapperX<>();
-
-        return selectPage(reqVO, queryWrapperX
-                .likeIfPresent(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
+        queryWrapperX.likeIfPresent(StudentAttendanceDO::getStudentName, reqVO.getStudentName())
                 .betweenIfPresent(StudentAttendanceDO::getDate, reqVO.getDate())
                 .betweenIfPresent(StudentAttendanceDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(StudentAttendanceDO::getStudentId, loginId)
-                // 添加 clockInStatus 的筛选
-                .and(wrapper -> wrapper
-                        .eq(StudentAttendanceDO::getClockInStatus, 1)
-                        .or()
-                        .eq(StudentAttendanceDO::getClockInStatus, 2)
-                )
-                .orderByAsc(StudentAttendanceDO::getClockInStatus) // 先按状态排序
-                .orderByDesc(StudentAttendanceDO::getClockInTime) // 再按时间排序
-        );
+                .eqIfPresent(StudentAttendanceDO::getClockInStatus, reqVO.getClockInStatus())
+                //1未打卡，2警告
+                .in(StudentAttendanceDO::getClockInStatus, Arrays.asList(1, 2));
+
+        if (roleIds.contains(113L)){//如果是导师，只看工作间下面的
+            queryWrapperX.eqIfPresent(StudentAttendanceDO::getDeptId,dept_id)
+                            .orderByDesc(StudentAttendanceDO::getClockInTime);
+        }else if (roleIds.contains(112L)){//是学生，只看自己的(先显示状态的)
+            queryWrapperX.eqIfPresent(StudentAttendanceDO::getStudentId, loginId)
+                    .and(wrapper -> wrapper
+                    .eq(StudentAttendanceDO::getClockInStatus, 1)
+                    .or()
+                    .eq(StudentAttendanceDO::getClockInStatus, 2)
+            )
+                    .orderByAsc(StudentAttendanceDO::getClockInStatus) // 先按状态排序
+                    .orderByDesc(StudentAttendanceDO::getClockInTime); // 再按时间排序;
+        }
+
+         return selectPage(reqVO,queryWrapperX);
     }
 
 
+
     @Select("SELECT * FROM system_student_attendance WHERE user_number = #{userNumber}")
     List<StudentAttendanceDO> getStudentAttendanceByUserNumber(String userNumber);
 
@@ -149,4 +115,8 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
     @Select("SELECT * FROM system_student_attendance " +
             "WHERE date = #{clockDate}")
     List<StudentAttendanceDO> getStudentsAttendanceDay(@Param("clockDate") LocalDate clockDate);
+
+    //找登录用户的权限
+    @Select("SELECT role_id FROM system_user_role WHERE user_id = #{userId}")
+    List<Long> selectUserRoleId(Long userId);
 }

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

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import cn.iocoder.yudao.module.system.service.permission.PermissionService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
@@ -18,6 +19,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +28,7 @@ import java.util.Objects;
 @Mapper
 public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
 
+
     default AdminUserDO selectByUsername(String username) {
         return selectOne(AdminUserDO::getUsername, username);
     }
@@ -49,7 +52,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .orderByDesc(AdminUserDO::getId));
     }
 
-// 查所有老师管理查询   参数1. reqVo模糊查询  2.过滤部门及子部门
+//  查所有老师管理查询
     default PageResult<AdminUserDO> selectPage0(UserPageReqVO reqVO, Collection<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
@@ -63,25 +66,30 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .orderByDesc(AdminUserDO::getId));
     }
 
-        // lsq  查所有学生
-        default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds) {
-            // 查询用户数据
-            PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
-                    .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
-                    .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
-                    .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
-                    .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
-                    .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                    .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
-                    .orderByDesc(AdminUserDO::getId));
-
-            // 遍历结果集，设置 photoIsExist
-            for (AdminUserDO user : result.getList()) {
-                user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
-            }
-
-            return result;
+    // 会根据登录 查所有学生
+    default PageResult<AdminUserDO> selectPage1(UserPageReqVO reqVO, Collection<Long> deptIds) {
+        // 查询用户数据
+        Long loginId =SecurityFrameworkUtils.getLoginUserId();
+        List<Long> roleId = selectUserRoleId(loginId);
+        LambdaQueryWrapperX<AdminUserDO> queryWrapperX =new LambdaQueryWrapperX<AdminUserDO>();
+        queryWrapperX.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
+                .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
+                .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
+                .inIfPresent(AdminUserDO::getDeptId, deptIds)
+                .inSql(AdminUserDO::getId, "SELECT id FROM system_users WHERE user_type IN (1,2)")
+                .orderByDesc(AdminUserDO::getId);
+
+        if (roleId.contains(113L)){//如果是教师,只找导师是登录的
+            queryWrapperX.eqIfPresent(AdminUserDO::getSupervisorId,loginId);
+        }
+        PageResult<AdminUserDO> result = selectPage(reqVO,queryWrapperX);
+        // 遍历结果集，设置 photoIsExist
+        for (AdminUserDO user : result.getList()) {
+            user.setPhotoIsExist(Long.valueOf(user.getPhotoUrl() != null && !user.getPhotoUrl().isEmpty() ? 1 : 0));
         }
+        return result;
+    }
 
     // lsq  查工作间下的老师 3老师
     default PageResult<AdminUserDO> selectDeptTeacherPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
@@ -125,40 +133,27 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return result;
     }
 
-
-    // lsq  查所有毕业学生
+    // lsq  根据登录人员查所有毕业学生
     default PageResult<AdminUserDO> selectGraduateStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
-                //找毕业生1.本校，2毕业，3老师
-                .eqIfPresent(AdminUserDO::getUserType,"2")
-                //.likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
-                .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
-                .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
-                .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                //新加的查询条件
-                .eqIfPresent(AdminUserDO::getGrade, reqVO.getGrade())
-                .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())//
-                .orderByDesc(AdminUserDO::getId));
-    }
-
-    // lsq  查所有毕业学生
-    default PageResult<AdminUserDO> selectGraduateStudentTPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
         Long loginId =SecurityFrameworkUtils.getLoginUserId();
-        return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
-                //找毕业生1.本校，2毕业，3老师
-                .eqIfPresent(AdminUserDO::getUserType,"2")
-                //找到登录的导师
-                .eqIfPresent(AdminUserDO::getSupervisorId,loginId)
+        List<Long> roleId = selectUserRoleId(loginId);
+        LambdaQueryWrapperX<AdminUserDO> queryWrapper = new LambdaQueryWrapperX<AdminUserDO>()
+                // 找毕业生: 1. 本校, 2. 毕业生, 3. 老师
+                .eqIfPresent(AdminUserDO::getUserType, "2")
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 .eqIfPresent(AdminUserDO::getGrade, reqVO.getGrade())
-                .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())//
-                .orderByDesc(AdminUserDO::getId));
+                .likeIfPresent(AdminUserDO::getNickname, reqVO.getNickname())
+                .orderByDesc(AdminUserDO::getId);
+        if (roleId.contains(113L)){//如果是教师
+            queryWrapper.eqIfPresent(AdminUserDO::getSupervisorId,loginId);
+        }
+        return selectPage(reqVO,queryWrapper);
     }
 
+
     //上面是分页
     // lsq  查所有导师列表
     default List<AdminUserDO> selectSupervisor() {
@@ -188,6 +183,10 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return selectList(AdminUserDO::getDeptId, deptIds);
     }
 
+
+    @Select("SELECT role_id FROM system_user_role WHERE user_id = #{userId}")
+    List<Long> selectUserRoleId(Long userId);
+
     //通过学号查找用户
     @Select("SELECT * FROM system_users WHERE user_number = #{userNumber}")
     AdminUserDO findUserByUserNumber(String userNumber);

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

@@ -53,15 +53,12 @@ public interface StudentAttendanceService {
      * @param pageReqVO 分页查询
      * @return 学生考勤记录分页
      */
+    //全部
     PageResult<StudentAttendanceDO> getStudentAttendancePage(StudentAttendancePageReqVO pageReqVO);//导师
 
-    PageResult<StudentAttendanceDO> collegeGetStudentAttendancePage(StudentAttendancePageReqVO pageReqVO);//学院
-
     //异常
     PageResult<StudentAttendanceDO> getStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO);//导师
-    PageResult<StudentAttendanceDO> collegeGetStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO);//学院
 
-    PageResult<StudentAttendanceDO> getStudentAttendanceSelfPage(StudentAttendancePageReqVO pageReqVO);
 
     List<StudentAttendanceDO> getStudentAttendanceByUserNumber(String userNumber);
 

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

@@ -73,24 +73,13 @@ public class StudentAttendanceServiceImpl implements StudentAttendanceService {
         return studentAttendanceMapper.selectPage(pageReqVO);
     }
 
-    @Override//学院学生
-    public PageResult<StudentAttendanceDO> collegeGetStudentAttendancePage(StudentAttendancePageReqVO pageReqVO) {
-        return studentAttendanceMapper.collegeSelectPage(pageReqVO);
-    }
+
 
     @Override
     public PageResult<StudentAttendanceDO> getStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO) {
         return studentAttendanceMapper.selectErrorPage(pageReqVO);
     }
 
-    @Override
-    public PageResult<StudentAttendanceDO> collegeGetStudentAttendanceErrorPage(StudentAttendancePageReqVO pageReqVO) {
-        return studentAttendanceMapper.collegeSelectErrorPage(pageReqVO);
-    }
-    @Override
-    public PageResult<StudentAttendanceDO> getStudentAttendanceSelfPage(StudentAttendancePageReqVO pageReqVO) {
-        return studentAttendanceMapper.selectSelfPage(pageReqVO);
-    }
 
 
     @Override

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

@@ -122,10 +122,9 @@ public interface AdminUserService {
     PageResult<AdminUserDO> getDeptStudentPage(UserPageReqVO reqVO);
     //查工作间下的所有人
     List<AdminUserDO> getDeptUser();
-    //查毕业生(学院)
+    //查毕业生(学院和导师)
     PageResult<AdminUserDO> getGraduateStudentPage(UserPageReqVO reqVO);
-    //查毕业生(导师)
-    PageResult<AdminUserDO> getGraduateStudentTPage(UserPageReqVO reqVO);
+
     //查所有导师
     List<AdminUserDO> getSupervisor();
 

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

@@ -291,11 +291,11 @@ public class AdminUserServiceImpl implements AdminUserService {
     public PageResult<AdminUserDO>getGraduateStudentPage(UserPageReqVO reqVO) {
         return userMapper.selectGraduateStudentPage(reqVO, getDeptCondition(reqVO.getDeptId()));
     }
-    //找毕业生(老师)
-    @Override
-    public PageResult<AdminUserDO>getGraduateStudentTPage(UserPageReqVO reqVO) {
-        return userMapper.selectGraduateStudentTPage(reqVO, getDeptCondition(reqVO.getDeptId()));
-    }
+//    //找毕业生(老师)
+//    @Override
+//    public PageResult<AdminUserDO>getGraduateStudentTPage(UserPageReqVO reqVO) {
+//        return userMapper.selectGraduateStudentTPage(reqVO, getDeptCondition(reqVO.getDeptId()));
+//    }
     //查询所有导师
     @Override
     public List<AdminUserDO> getSupervisor() {