From 198e3ac49db7a7ff55b44d2453d70c69dacc70ed Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Wed, 15 Apr 2026 15:54:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/system/SysUserController.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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..ccdee6e 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; - /** * 获取用户列表 */ @@ -243,7 +241,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 +275,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); } } From 41b09a7d61579838b4aa51e05473fc367c5b7777 Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Wed, 15 Apr 2026 16:06:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DgetInfo=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/system/controller/system/SysUserController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ccdee6e..a68b704 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 @@ -147,9 +147,9 @@ public class SysUserController extends BaseController { // 获取 ImAgentAdmin 信息 ImAgentAdmin tokenInfo = getImAgentAdminBySysId(loginUser.getUserId()); - // 如果不存在，创建新的 - if (tokenInfo == null) { - imAgentAdminService.insertAgentData(loginUser.getUserId(), user.getNickName()); + // 如果不是超级管理员且不存在记录，创建新的 + if (!LoginHelper.isSuperAdmin() && tokenInfo == null) { + imAgentAdminService.insertAgentData(loginUser.getUserId(), user.getUserName()); tokenInfo = getImAgentAdminBySysId(loginUser.getUserId()); } From 2ece418a47622f6586edf0287af430c08a5eb4f6 Mon Sep 17 00:00:00 2001 From: La123123 <617330105@qq.com> Date: Wed, 15 Apr 2026 16:09:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88getinfo=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/system/controller/system/SysUserController.java | 6 ------ 1 file changed, 6 deletions(-) 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 a68b704..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 @@ -147,12 +147,6 @@ public class SysUserController extends BaseController { // 获取 ImAgentAdmin 信息 ImAgentAdmin tokenInfo = getImAgentAdminBySysId(loginUser.getUserId()); - // 如果不是超级管理员且不存在记录，创建新的 - if (!LoginHelper.isSuperAdmin() && tokenInfo == null) { - imAgentAdminService.insertAgentData(loginUser.getUserId(), user.getUserName()); - tokenInfo = getImAgentAdminBySysId(loginUser.getUserId()); - } - userInfoVo.setUser(user); userInfoVo.setTokenInfo(tokenInfo); userInfoVo.setPermissions(loginUser.getMenuPermission());