From 375858c9438226c5839228ffc9a6f045a3ba76dd Mon Sep 17 00:00:00 2001
From: liangwen <2357318727@qq.com>
Date: Fri, 12 Sep 2025 09:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=B3=E8=AF=B7=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8E=A5=E5=8F=A3=E6=BC=8F=E6=8F=90=E4=BA=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/SysRegisterRequestController.java  | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/hb-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterRequestController.java b/hb-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterRequestController.java
index 567f230..c4873b2 100644
--- a/hb-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterRequestController.java
+++ b/hb-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterRequestController.java
@@ -1,10 +1,16 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +42,12 @@ public class SysRegisterRequestController extends BaseController
     @Autowired
     private ISysRegisterRequestService sysRegisterRequestService;
 
+    @Autowired
+    private ISysRoleService roleService;
+
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询注册申请列表
      */
@@ -70,7 +82,18 @@ public class SysRegisterRequestController extends BaseController
     @GetMapping(value = "/{requestId}")
     public AjaxResult getInfo(@PathVariable("requestId") Long requestId)
     {
-        return success(sysRegisterRequestService.selectSysRegisterRequestByRequestId(requestId));
+        AjaxResult ajax = AjaxResult.success();
+        SysRegisterRequest sysRegisterRequest = sysRegisterRequestService.selectSysRegisterRequestByRequestId(requestId);
+        if (sysRegisterRequest != null)
+        {
+            Long userId = sysRegisterRequest.getUserId();
+            List<SysRole> roles = roleService.selectRoleAll();
+            ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+            SysUser sysUser = userService.selectUserById(userId);
+            ajax.put(AjaxResult.DATA_TAG, sysRegisterRequest);
+            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+        }
+        return ajax;
     }
 
     /**
@@ -106,24 +129,27 @@ public class SysRegisterRequestController extends BaseController
         return toAjax(sysRegisterRequestService.deleteSysRegisterRequestByRequestIds(requestIds));
     }
 
-    @ApiOperation(value = "2.2 注册申请审核通过")
+    @ApiOperation(value = "2.2 注册申请人工审核通过")
     @ApiOperationSupport(order = 2)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "requestId", value = "申请id", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "remark", value = "备注", dataType = "String", dataTypeClass = String.class, required = false),
+            @ApiImplicitParam(name = "roleIds", value = "角色id数组", required = false),
     })
     @PostMapping("/approve/{requestId}")
-    public AjaxResult approve(@PathVariable Long requestId, @RequestParam(required = false) String remark) {
+    public AjaxResult approve(@PathVariable Long requestId,
+                              @RequestParam(required = false) String remark,
+                              @RequestParam(required = false) Long[] roleIds) {
         try {
-            sysRegisterRequestService.approve(requestId, true, remark);
-            return AjaxResult.success("审批通过");
+            sysRegisterRequestService.approve(requestId, true, remark, roleIds);
+            return AjaxResult.success();
         } catch (Exception e) {
             e.printStackTrace();
-            return AjaxResult.error("审批出错");
+            return AjaxResult.error(e.getMessage());
         }
     }
 
-    @ApiOperation(value = "2.3 注册申请驳回")
+    @ApiOperation(value = "2.3 注册申请人工审核驳回")
     @ApiOperationSupport(order = 3)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "requestId", value = "申请id", dataType = "Integer", dataTypeClass = Integer.class),
@@ -132,11 +158,11 @@ public class SysRegisterRequestController extends BaseController
     @PostMapping("/reject/{requestId}")
     public AjaxResult reject(@PathVariable Long requestId, @RequestParam String remark) {
         try {
-            sysRegisterRequestService.approve(requestId, false, remark);
-            return AjaxResult.success("已驳回");
+            sysRegisterRequestService.approve(requestId, false, remark, null);
+            return AjaxResult.success();
         } catch (Exception e) {
             e.printStackTrace();
-            return AjaxResult.error("已驳回出错");
+            return AjaxResult.error(e.getMessage());
         }
     }
 }