From 1204c39917fb5e6eddd6b85536e83f450e538a18 Mon Sep 17 00:00:00 2001
From: hsdllcw <hsdllcw@qq.com>
Date: Fri, 23 Aug 2024 10:14:34 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E5=A4=96=E5=BC=80=E6=94=BE=E5=8F=AF=E8=83=BD=E5=BC=95?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84=E5=BE=AA=E7=8E=AF=E5=BC=95=E7=94=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/api/RemoteUserService.java   |  4 ++--
 .../factory/RemoteUserFallbackFactory.java    |  2 +-
 .../system/controller/SysUserController.java  | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
index f709b7664..9967489cf 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java
@@ -29,8 +29,8 @@ public interface RemoteUserService
      * @param source 请求来源
      * @return 结果
      */
-    @GetMapping("/user/{userId}")
-    public R<LoginUser> getInfo(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @GetMapping("/detail/{userId}")
+    public R<LoginUser> infoById(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
     /**
      * 通过用户名查询用户信息
      *
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index 0034e5929..175c4f87c 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -26,7 +26,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
         return new RemoteUserService()
         {
             @Override
-            public R<LoginUser> getInfo(Long userId, String source)
+            public R<LoginUser> infoById(Long userId, String source)
             {
                 return R.fail("获取用户失败:" + throwable.getMessage());
             }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index cc0acf033..cd66fd2e3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -153,6 +153,25 @@ public class SysUserController extends BaseController
         return R.ok(sysUserVo);
     }
 
+    /**
+     * 根据ID获取用户信息
+     */
+    @InnerAuth
+    @GetMapping("/detail/{userId}")
+    public R<LoginUser> infoById(@PathVariable("userId") Long userId)
+    {
+        SysUser sysUser = userService.selectUserById(userId);
+        // 角色集合
+        Set<String> roles = permissionService.getRolePermission(sysUser);
+        // 权限集合
+        Set<String> permissions = permissionService.getMenuPermission(sysUser);
+        LoginUser sysUserVo = new LoginUser();
+        sysUserVo.setSysUser(sysUser);
+        sysUserVo.setRoles(roles);
+        sysUserVo.setPermissions(permissions);
+        return R.ok(sysUserVo);
+    }
+
     /**
      * 注册用户信息
      */