From 4b85a64a22796b601f9ec75b35b9735acf07891f Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 5 Aug 2024 09:21:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/system/SysUserApplyController.java | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java
index 449f8cf..1eee99e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java
@@ -2,15 +2,20 @@ package com.ruoyi.web.controller.system.system;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * packageName com.ruoyi.web.controller.system.system
@@ -29,27 +34,31 @@ public class SysUserApplyController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ISysRoleService roleService;
+    @Autowired
+    private ISysPostService postService;
+
 
     private String prefix = "system/user/userApply";
 
 
     @RequiresPermissions("system:userApply:view")
     @GetMapping()
-    public String apply()
-    {
+    public String apply() {
         return prefix + "/userApply";
     }
 
     /**
      * 人员申请列表
+     *
      * @param user
      * @return
      */
     @RequiresPermissions("system:userApply:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(SysUser user)
-    {
+    public TableDataInfo list(SysUser user) {
         startPage();
         user.setExamine("2");
         List<SysUser> list = userService.selectUserList(user);
@@ -57,15 +66,29 @@ public class SysUserApplyController extends BaseController {
     }
 
 
+    /**
+     * 人员审核
+     */
+    @RequiresPermissions("system:userApply:apply")
     @GetMapping("/apply/{userId}")
-    public AjaxResult userExamine(@PathVariable("userId") Long userId) {
-         boolean  update= userService.lambdaUpdate()
+    public String apply(@PathVariable("userId") Long userId, ModelMap mmap) {
+        List<SysRole> roles = roleService.selectRolesByUserId(userId);
+        mmap.put("sysuser", getSysUser());
+        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 + "/Applydetail";
+    }
+
+
+    @GetMapping("/submit/{userId}")
+    public AjaxResult submit(@PathVariable("userId") Long userId) {
+        boolean update = userService.lambdaUpdate()
                 .eq(SysUser::getUserId, userId)
                 .set(SysUser::getExamine, "3").update();
-         return toAjax(update);
+        return toAjax(update);
 
     }
 
 
-
 }