12.31,部分主页的显示判断

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

@@ -98,7 +98,7 @@ public class DeptController {
         if (originLeaderList != null ){
             //减
             for (Long teacherId : originLeaderList) {//负责人的工作间
-                if(!newLeaderList.contains(teacherId)){//新的不包含教师id
+                if(!newLeaderList.contains(teacherId)){//新的不包含原来的教师id
                     //给教师删除deptId
                     AdminUserDO teacher = adminUserService.getUser(teacherId);
                     if (teacher!=null) {
@@ -106,7 +106,7 @@ public class DeptController {
                         adminUserService.updateUser(BeanUtils.toBean(teacher, UserSaveReqVO.class));
                     }
                 }
-                newLeaderList.remove(teacherId);
+                newLeaderList.remove(teacherId);//去除新的里面包含的旧的
             }
             //增
             List<AdminUserDO> teachers = adminUserService.getUserList(newLeaderList);

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

@@ -515,15 +515,15 @@ public class StudentAttendanceController {
 
         // 去重正常打卡记录，使用学生名字来去重
         Set<String> uniqueNormalStudents = normalList.stream()
-                .map(StudentAttendanceDO::getUserNumber)  // 获取学生名字
+                .map(StudentAttendanceDO::getUserNumber)  // 获取学生学号
                 .collect(Collectors.toSet());  // 转换为 Set 去重
         //TODO未打卡的异常去重（以防万一）
         Set<String> uniqueErrorStudents = errorList.stream()
-                .map(StudentAttendanceDO::getUserNumber)  // 获取学生名字
+                .map(StudentAttendanceDO::getUserNumber)  // 获取学生学号
                 .collect(Collectors.toSet());  // 转换为 Set 去重
 
         Set<String> uniqueExcuseStudents = excuseList.stream()
-                .map(StudentAttendanceDO::getUserNumber)  // 获取学生名字
+                .map(StudentAttendanceDO::getUserNumber)  // 获取学生学号
                 .collect(Collectors.toSet());  // 转换为 Set 去重
 
         Integer errorNum =uniqueErrorStudents.size();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/studentSelectSupervisorRecordController.java

@@ -465,6 +465,4 @@ public class studentSelectSupervisorRecordController {
     }
 
 
-
-
 }

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

@@ -194,21 +194,15 @@ public class UserController {
     @PreAuthorize("@ss.hasPermission('system:user:deptTeacherList')")
     public CommonResult<PageResult<UserRespVO>> getTeacherPageForTeacher(@Valid UserPageReqVO pageReqVO) {
 
-        // 获得用户分页列表
-        Long deptId =SecurityFrameworkUtils.getLoginUserDeptId();
-        if (deptId!=null && deptId!=0) {
-            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()));
-        }else {
-            return null;
+        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
@@ -237,12 +231,7 @@ public class UserController {
     @PreAuthorize("@ss.hasPermission('system:user:teacherGetstudentList')")
     public CommonResult<PageResult<UserRespVO>> getUserPageForTeacher(@Valid UserPageReqVO pageReqVO) {
         // 获得用户分页列表
-        Long loginId = SecurityFrameworkUtils.getLoginUserId();
-        Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
-        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        if (roleIds.contains(113L)&&(deptId==null||deptId==0)){
-            return null;
-        }
+
         PageResult<AdminUserDO> pageResult = userService.getUserPageForTeacher(pageReqVO);
         if (CollUtil.isEmpty(pageResult.getList())) {
             return success(new PageResult<>(pageResult.getTotal()));
@@ -622,8 +611,8 @@ public class UserController {
             //更新导师的
             List<Long> supervisorIds = project.getSupervisorIds();
             UserSaveReqVO saveReqVO =new UserSaveReqVO();
-            UserPageReqVO studentVo =new UserPageReqVO();
-            studentVo.setGrade(project.getStudentGrade());
+            UserPageReqVO studentVO =new UserPageReqVO();
+            studentVO.setGrade(project.getStudentGrade());
             if (supervisorIds!=null&&!supervisorIds.isEmpty()){
                 for (Long supervisorId : supervisorIds){
                     saveReqVO.setId(supervisorId);
@@ -634,7 +623,7 @@ public class UserController {
                 }
             }
             //更新学生
-            List<AdminUserDO> studentList = userService.getUserList1(studentVo);
+            List<AdminUserDO> studentList = userService.getUserList1(studentVO);
             if (PD.getIsStudent()!=null&&studentList!=null&&!studentList.isEmpty()){
                 saveReqVO =new UserSaveReqVO();
                 for (AdminUserDO student :studentList){

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

@@ -54,8 +54,10 @@ public interface StudentAttendanceMapper extends BaseMapperX<StudentAttendanceDO
 
         if (roleIds != null && !roleIds.isEmpty()) {
             if (roleIds.contains(113L)) {//是教师 只出现在老师工作间下面的学生考勤情况
-                if (dept_id!=null&&dept_id!=0) {
+                if(dept_id != null && dept_id != 0 ){
                     queryWrapper.eqIfPresent(StudentAttendanceDO::getDeptId, dept_id);
+                }else {//不查
+                    queryWrapper.eqIfPresent(StudentAttendanceDO::getDeptId,-1);
                 }
             } else if (roleIds.contains(112L)) {//是学生，只显示自己的
                 queryWrapper.eqIfPresent(StudentAttendanceDO::getStudentId, loginId);

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

@@ -193,7 +193,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
             @Param("reqVO") UserPageReqVO reqVO,
             @Param("deptIds") Collection<Long> deptIds,
             @Param("roleIds") Set<Long> roleIds,
-            @Param("deptId") Long deptId
+            @Param("deptId") Long deptId,
+            @Param("loginId") Long loginId
     );
 //    default List<AdminUserDO> selectList1(UserPageReqVO reqVO, Collection<Long> deptIds,Set<Long>roleIds,Long deptId) {
 //

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

@@ -457,7 +457,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        List<AdminUserDO> result =userMapper.selectList1(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId);
+        List<AdminUserDO> result =userMapper.selectList1(reqVO, getDeptCondition(reqVO.getDeptId()),roleIds,deptId,loginId);
         return result;
     };
 

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

@@ -291,10 +291,12 @@
                 #{deptId}
             </foreach>
         </if>
+
         <if test="roleIds != null and roleIds.contains(113L)">
-            AND a.dept_id = #{deptId}
+            AND a.supervisor_id =#{loginId}
             AND a.user_type = 1
         </if>
+
         <if test="roleIds != null and roleIds.contains(114L)">
             AND a.user_type = 1
         </if>