From ba5d53d823c79b20f86ed6e6e1ad8d3426fad740 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Mon, 15 Apr 2024 16:32:50 +0800
Subject: [PATCH] userexamine

---
 .../web/controller/system/SysUserExamineController.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java
index 2ea1956..5eedcda 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserExamineController.java
@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/system/userexamine")
@@ -27,6 +28,10 @@ public class SysUserExamineController extends BaseController {
     private String prefix = "system/user/userexamine";
     @Autowired
     private ISysUserService userService;
+    @Autowired
+    private ISysRoleService roleService;
+    @Autowired
+    private ISysPostService postService;
     @RequiresPermissions("system:userexamine:view")
     @GetMapping()
     public String user()
@@ -56,7 +61,11 @@ public class SysUserExamineController extends BaseController {
     @GetMapping("/examine/{userId}")
     public String userExamine(@PathVariable("userId") Long userId, ModelMap mmap)
     {
+        userService.checkUserDataScope(userId);
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
         mmap.put("user", userService.selectUserById(userId));
+        mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        mmap.put("posts", postService.selectPostsByUserId(userId));
         return prefix + "/examinedetail";
     }