11.23

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

@@ -104,6 +104,9 @@ public class AdminUserServiceImpl implements AdminUserService {
             }
         });
 
+        Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        Set<Long> UserRoleIds = permissionService.getUserRoleIdListByUserId(loginId);//获取登录人的权限
+
         if (createReqVO.getUserType().equals("2")){//是毕业生
             createReqVO.setPassword(encodePassword("123456"));//设置毕业生密码
             createReqVO.setUsername("graduate" + String.valueOf((int) (Math.random() * 900000) + 100000));//毕业生账号
@@ -122,6 +125,12 @@ public class AdminUserServiceImpl implements AdminUserService {
             user.setPassword(encodePassword(createReqVO.getPassword())); // 加密密码
         }
 
+        if (UserRoleIds.contains(113L)&&createReqVO.getSupervisorId()==null){//导师直接创建在校生和毕业生
+            if (createReqVO.getUserType().equals("2")||createReqVO.getUserType().equals("1")){
+                user.setSupervisorId(loginId);
+            }
+        }
+
         userMapper.insert(user);
 
         if ("3".equals(createReqVO.getUserType())){//是导师直接添加为负责人
@@ -854,7 +863,7 @@ public class AdminUserServiceImpl implements AdminUserService {
             // 2.2.2 如果存在，判断是否允许更新
             if (!isUpdateSupport) {
                 if (importUser.getUsername()!=null) {
-                    respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNAME_EXISTS.getMsg());
+                    respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNUMBER_EXISTS.getMsg());
                     return;
                 }
             }
@@ -917,7 +926,6 @@ public class AdminUserServiceImpl implements AdminUserService {
                 }else if (UserRoleIds.contains(113L) &&importUser.getSupervisor()!=null){
                     newUser.setSupervisorId(userMapper.getUserByNickName(importUser.getSupervisor()).getId());
                 }
-                System.out.println(newUser);
                 Long userId = createUser(newUser); // 执行插入用户数据
                 Set<Long> roleIds = new HashSet<>();
                 //赋予学生角色
@@ -931,7 +939,7 @@ public class AdminUserServiceImpl implements AdminUserService {
             // 2.2.2 如果存在，判断是否允许更新
             if (!isUpdateSupport) {
                 if (importUser.getUsername() != null) {
-                    respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNAME_EXISTS.getMsg());
+                    respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNUMBER_EXISTS.getMsg());
                     return;
                 }
             }
@@ -1022,7 +1030,7 @@ public class AdminUserServiceImpl implements AdminUserService {
             // 2.2.2 如果存在，不允许更新
             if (!isUpdateSupport) {
                 if (importUser.getUsername()!=null) {
-                    respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNAME_EXISTS.getMsg());
+                    respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNUMBER_EXISTS.getMsg());
                     return;
                 }
             }