From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 16 十月 2023 20:31:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java index 1d38c73..19f6d21 100644 --- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java +++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java @@ -27,8 +27,10 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; import com.vci.ubcs.system.user.vo.UserVO; +import org.springblade.core.secure.BladeUser; import java.util.List; +import java.util.Map; /** * 鏈嶅姟绫� @@ -88,6 +90,12 @@ * @return */ List<User> selectAllUser(User user, Long deptId); + + /** + * 鑾峰彇鎵�鏈� + * @return + */ + List<User> selectAllUser(); /** * 鑷畾涔夊垎椤� @@ -244,4 +252,12 @@ */ boolean updateByUseStrategyId(List<Long> userIds); + /** + * 鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃 + * @param user 鐢ㄦ埛鏌ヨ鐨勭敤鎴蜂俊鎭紝濡傜鎴蜂俊鎭紝閫氬父涓鸿嚜鍔ㄦ敞鍏ワ紝鍓嶇鍙�夋嫨涓嶄紶 + * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤 + * @return + */ + List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName); + } -- Gitblit v1.9.3