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); } }