1.13，更新时权限和显示校外导师

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

@@ -90,7 +90,7 @@ public class UserController {
         if (reqVO.getUserType()!=null){//添加权限
             if (reqVO.getUserType().equals("1") ||reqVO.getUserType().equals("2")){
                 roleId.add(112L);//学生
-            }else if (reqVO.getUserType().equals("3")){
+            }else if (reqVO.getUserType().equals("3")||reqVO.getUserType().equals("5")){
                 roleId.add(113L);
             }else if (reqVO.getUserType().equals("4")){
                 roleId.add(114L);
@@ -109,13 +109,13 @@ public class UserController {
         if (reqVO.getUserType()!=null){//添加权限
             if (reqVO.getUserType().equals("1") ||reqVO.getUserType().equals("2")){
                 roleId.add(112L);//学生
-            }else if (reqVO.getUserType().equals("3")){//导师
+            }else if (reqVO.getUserType().equals("3")||reqVO.getUserType().equals("5")){//校内导师和校外导师
                 roleId.add(113L);
             }else if (reqVO.getUserType().equals("4")){//学院
                 roleId.add(114L);
             }
+            permissionService.assignUserRole(reqVO.getId(),roleId);
         }
-        permissionService.assignUserRole(reqVO.getId(),roleId);
         return success(true);
     }
 
@@ -205,8 +205,9 @@ public class UserController {
                 pageResult.getTotal()));
     }
 
+
     @GetMapping("/getTeacherPageForTeacher")
-    @Operation(summary = "获得老师分页列表")
+    @Operation(summary = "导师获得工作间下导师分页列表")
     @PreAuthorize("@ss.hasPermission('system:user:deptTeacherList')")
     public CommonResult<PageResult<UserRespVO>> getTeacherPageForTeacher(@Valid UserPageReqVO pageReqVO) {
 

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

@@ -82,8 +82,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .likeIfPresent(AdminUserDO::getUserNumber,reqVO.getUserNumber())//学号查询
                 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
                 .inIfPresent(AdminUserDO::getDeptId, deptIds)
-                // 添加子查询条件，查找有教师权限的人
-                .eqIfPresent(AdminUserDO::getUserType,3)
+                // 添加子查询条件，查找校内导师和校外导师
+                .inIfPresent(AdminUserDO::getUserType,3,5)
                 .orderByDesc(AdminUserDO::getId);
         if (roleIds.contains(114L)) {//学院