From 84a4e6fc7d02007b64fc160567fbf667fdf9095f Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 1 Nov 2024 11:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E5=91=98=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/system/api/RemoteUserService.java | 4 ++-- .../system/api/factory/RemoteUserFallbackFactory.java | 8 ++++---- .../com/bonus/system/controller/SysUserController.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java index 35afeef..fee75e3 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java @@ -179,8 +179,8 @@ public interface RemoteUserService { * @param source 请求来源 * @return 部门人员树列表或失败消息 */ - @GetMapping("/user/deptUserTree") - public AjaxResult deptUserTree(SysDept dept, List roleIds, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +// @GetMapping("/user/deptUserTreeInRoleIds") +// public AjaxResult deptUserTreeInRoleIds(SysDept dept, List roleIds, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 修改用户审批状态 diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java index 27e79b3..730ff0d 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java @@ -129,10 +129,10 @@ public class RemoteUserFallbackFactory implements FallbackFactory roleIds, String source) { - return AjaxResult.error("根据角色列表获取部门人员树列表:" + throwable.getMessage()); - } +// @Override +// public AjaxResult deptUserTreeInRoleIds(SysDept dept, List roleIds, String source) { +// return AjaxResult.error("根据角色列表获取部门人员树列表:" + throwable.getMessage()); +// } @Override public AjaxResult approvalStatus(SysUser user, String source) { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index 3015a03..9c6d7e1 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -468,7 +468,7 @@ public class SysUserController extends BaseController { */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) @GetMapping("/deptUserTreeInRoleIds") - public AjaxResult deptUserTree(SysDept dept, List roleIds) { + public AjaxResult deptUserTreeInRoleIds(SysDept dept, List roleIds) { try { return success(deptService.selectDeptUserTree(dept, roleIds)); } catch (Exception e) {