From 10d89b1540f4fe03f2de020fde13fedbf6df6dfa Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Wed, 28 May 2025 14:21:33 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=A2=9E=E5=8A=A0=E4=B9=9D=E9=87=8C?= =?UTF-8?q?=E6=B9=96=E9=83=A8=E9=97=A8=E6=8C=87=E6=B4=BE=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysRoleController.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index dedb36f..3975f30 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -26,6 +26,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse; + +import java.util.ArrayList; import java.util.List; /** @@ -237,10 +239,18 @@ public class SysRoleController extends BaseController { @GetMapping(value = "/user/list") public R> listRoleUser() { String roleName = "dispose"; + String roleJiuLiName = "jiulihu_dipose"; + + List resultlist = new ArrayList<>(); + + List userList = roleService.getUserIno(roleName); + List userjiuliList = roleService.getUserIno(roleJiuLiName); + + resultlist.addAll(userjiuliList); - List userList = roleService.getUserIno(roleName); + resultlist.addAll(userList); - return R.ok(userList); + return R.ok(resultlist); } }