From 63013400c2790a650878445c8352992df71103b2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 19 七月 2023 11:42:59 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/IUserService.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 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 51ace0f..74db1d6 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; /** * 鏈嶅姟绫� @@ -84,6 +86,23 @@ * 鑷畾涔夊垎椤� * * @param user + * @param deptId + * @return + */ + List<User> selectAllUser(User user, Long deptId); + /** + * 鑾峰彇鎵�鏈� + * + * @param user + * @param deptId + * @return + */ + List<User> selectAllUser(); + + /** + * 鑷畾涔夊垎椤� + * + * @param user * @param query * @return */ @@ -105,6 +124,15 @@ * @return */ UserInfo userInfo(String tenantId, String account); + + /** + * 鐢ㄦ埛淇℃伅,涓哄暐涓嶅垹浜嗕笂杈归偅涓柟娉曞憿锛屽洜涓烘垜涓嶆暍,鐗垫壇鏈夌偣澶� + * + * @param tenantId + * @param account + * @return + */ + UserInfo userInfo(String tenantId, String account,String name); /** * 鐢ㄦ埛淇℃伅 @@ -226,4 +254,12 @@ */ boolean updateByUseStrategyId(List<Long> userIds); + /** + * 鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃 + * @param user 鐢ㄦ埛鏌ヨ鐨勭敤鎴蜂俊鎭紝濡傜鎴蜂俊鎭紝閫氬父涓鸿嚜鍔ㄦ敞鍏ワ紝鍓嶇鍙�夋嫨涓嶄紶 + * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤 + * @return + */ + List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName); + } -- Gitblit v1.9.3