11.5

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

@@ -77,25 +77,23 @@ public class MailTemplateController {
 
             StringBuilder normalListBuilder = new StringBuilder();
             for (StudentAttendanceEmailVO attendance : normalList) {
-                normalListBuilder.append("学生id: ").append(attendance.getId())
+                normalListBuilder
                         .append(", 学生姓名: ").append(attendance.getStudentName())
                         .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                        .append(", 工作间名称: ").append(deptService.getDept(Long.valueOf(attendance.getDeptId())).getName()) // 这里需要映射为实际工作间名称
+//                        .append(", 工作间名称: ").append(deptService.getDept(Long.valueOf(attendance.getDeptId())).getName()) // 这里需要映射为实际工作间名称
                         .append(", 日期: ").append(attendance.getDate())
                         .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "未打卡")
-                        .append(", 创建时间: ").append(attendance.getCreateTime())
                         .append("<br/>");
             }
 
             StringBuilder errorListBuilder = new StringBuilder();
             for (StudentAttendanceEmailVO attendance : errorList) {
-                errorListBuilder.append("学生id: ").append(attendance.getId())
+                errorListBuilder
                         .append(", 学生姓名: ").append(attendance.getStudentName())
                         .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                        .append(", 工作间名称: ").append(deptService.getDept(Long.valueOf(attendance.getDeptId())).getName())
+//                        .append(", 工作间名称: ").append(deptService.getDept(Long.valueOf(attendance.getDeptId())).getName())
                         .append(", 日期: ").append(attendance.getDate())
                         .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "未打卡")
-                        .append(", 创建时间: ").append(attendance.getCreateTime())
                         .append("<br/>");
             }
 
@@ -193,22 +191,18 @@ public class MailTemplateController {
                 normalListBuilder.append("学生id: ").append(attendance.getId())
                         .append(", 学生姓名: ").append(attendance.getStudentName())
                         .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                        .append(", 工作间名称: ").append(deptService.getDept(Long.valueOf(attendance.getDeptId())).getName())
                         .append(", 日期: ").append(attendance.getDate())
                         .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "未打卡")
-                        .append(", 创建时间: ").append(attendance.getCreateTime())
                         .append("<br/>");
             }
 
             StringBuilder errorListBuilder = new StringBuilder();
             for (StudentAttendanceEmailVO attendance : errorList) {
-                errorListBuilder.append("学生id: ").append(attendance.getId())
+                errorListBuilder
                         .append(", 学生姓名: ").append(attendance.getStudentName())
                         .append(", 学生学号: ").append(attendance.getUserNumber() != null ? attendance.getUserNumber() : "无")
-                        .append(", 工作间名称: ").append(deptService.getDept(Long.valueOf(attendance.getDeptId())).getName())
                         .append(", 日期: ").append(attendance.getDate())
                         .append(", 打卡时间: ").append(attendance.getClockInTime() != null ? attendance.getClockInTime() : "未打卡")
-                        .append(", 创建时间: ").append(attendance.getCreateTime())
                         .append("<br/>");
             }
 

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

@@ -22,9 +22,12 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
     //获取登录人员工作间的信息
     default DeptDO selectLoginDept() {
         Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
-        return selectOne(new LambdaQueryWrapperX<DeptDO>()
-                .inSql(DeptDO::getId, String.valueOf(deptId))
-        );
+        if (deptId!=null) {
+            return selectOne(new LambdaQueryWrapperX<DeptDO>()
+                    .eqIfPresent(DeptDO::getId, deptId)
+            );
+        }
+        return null;
     }
 
     default DeptDO selectByParentIdAndName(Long parentId, String name) {

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

@@ -61,8 +61,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 // 添加子查询条件，查找有教师权限的人
-                .inSql(AdminUserDO::getId,
-                        "SELECT id FROM system_users WHERE user_type = 3")
+                .eqIfPresent(AdminUserDO::getUserType,3)
                 .orderByDesc(AdminUserDO::getId));
     }
 
@@ -77,7 +76,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .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)")
+                .inIfPresent(AdminUserDO::getUserType,1,2)
                 .orderByDesc(AdminUserDO::getId);
 
         if (roleIds.contains(113L)){//如果是教师,只找导师是登录的
@@ -89,8 +88,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
 
     // lsq  查工作间下的老师 3老师
     default PageResult<AdminUserDO> selectDeptTeacherPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
-                Long loginID = SecurityFrameworkUtils.getLoginUserId(); //
-               System.out.println(loginID);
+                Long deptId = SecurityFrameworkUtils.getLoginUserDeptId(); //
+
         return selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
                 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
                 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
@@ -98,17 +97,15 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
                 // 添加子查询条件，查找有教师权限的人
-                .inSql(AdminUserDO::getId,
-                        "SELECT id FROM system_users WHERE user_type = 3")
+                .eqIfPresent(AdminUserDO::getUserType, 3)
                 // 查到当前登录老师的工作间并且属于这个工作间的所有老师
-                .inSql(AdminUserDO::getDeptId, String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
+                .eqIfPresent(AdminUserDO::getDeptId,deptId)
                 .orderByDesc(AdminUserDO::getId));
     }
 
     // lsq  查工作间下的学生 1在校生
     default PageResult<AdminUserDO> selectDeptStudentPage(UserPageReqVO reqVO, Collection<Long> deptIds) {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId();
-        System.out.println(loginID);
+        Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
 
         // 查询用户数据
         PageResult<AdminUserDO> result = selectPage(reqVO, new LambdaQueryWrapperX<AdminUserDO>()
@@ -119,8 +116,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .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)")
-                .inSql(AdminUserDO::getDeptId, String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID))
+                .eqIfPresent(AdminUserDO::getDeptId,deptId)
+                .inIfPresent(AdminUserDO::getUserType,1,2)
                 .orderByDesc(AdminUserDO::getId));
 
         return result;
@@ -154,11 +151,11 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return selectList(queryWrapper);
     }
 
-    //  查工作间下的用户列表
+    //  查登录工作间下的用户列表
     default List<AdminUserDO> selectDeptUser() {
-        Long loginID = SecurityFrameworkUtils.getLoginUserId();
-        LambdaQueryWrapperX<AdminUserDO> queryWrapper = (LambdaQueryWrapperX<AdminUserDO>) new LambdaQueryWrapperX<AdminUserDO>()
-                .inSql(AdminUserDO::getDeptId, String.format("SELECT dept_id FROM system_users WHERE id = %d", loginID));
+        Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        LambdaQueryWrapperX<AdminUserDO> queryWrapper = new LambdaQueryWrapperX<AdminUserDO>()
+                .eqIfPresent(AdminUserDO::getDeptId,deptId);
         return selectList(queryWrapper);
     }
 
@@ -176,9 +173,6 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     }
 
 
-    @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);