diff --git a/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index f561d35..8e66184 100644 --- a/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/im-admin/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -59,8 +59,6 @@ public class SysUserController extends BaseController { private final ImAgentAdminService imAgentAdminService; - private final ImAgentAdminService imAgentService; - /** * 获取用户列表 */ @@ -149,12 +147,6 @@ public class SysUserController extends BaseController { // 获取 ImAgentAdmin 信息 ImAgentAdmin tokenInfo = getImAgentAdminBySysId(loginUser.getUserId()); - // 如果不存在,创建新的 - if (tokenInfo == null) { - imAgentAdminService.insertAgentData(loginUser.getUserId(), user.getNickName()); - tokenInfo = getImAgentAdminBySysId(loginUser.getUserId()); - } - userInfoVo.setUser(user); userInfoVo.setTokenInfo(tokenInfo); userInfoVo.setPermissions(loginUser.getMenuPermission()); @@ -243,7 +235,7 @@ public class SysUserController extends BaseController { //判断该用户是否拥有agentAdmin权限 if(permissions.contains("agentAdmin")){ //插入代理端数据 - int insertAgent = imAgentService.insertAgentData(newUser.getUserId(), newUser.getUserName()); + int insertAgent = imAgentAdminService.insertAgentData(newUser.getUserId(), newUser.getUserName()); return toAjax(insertAgent); } } @@ -277,16 +269,16 @@ public class SysUserController extends BaseController { List permissions = userService.getPermissionsByUserId(newUser.getUserId()); //判断该用户是否拥有agentAdmin权限 - if(permissions.contains("agentAdmin")){ + if(!user.isSuperAdmin() && permissions.contains("agentAdmin")){ //判断是否已经插入过代理端数据 - if(imAgentService.isExistAgent(newUser.getUserId())){ + if(imAgentAdminService.isExistAgent(newUser.getUserId())){ //更新代理用户名 - imAgentService.updateAgentName(newUser.getUserId(), newUser.getUserName()); + imAgentAdminService.updateAgentName(newUser.getUserId(), newUser.getUserName()); return toAjax(update); } //插入代理端数据 - int insertAgent = imAgentService.insertAgentData(newUser.getUserId(), newUser.getUserName()); + int insertAgent = imAgentAdminService.insertAgentData(newUser.getUserId(), newUser.getUserName()); return toAjax(insertAgent); } }