From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +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 |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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..fd13d1e 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,6 +27,7 @@
 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;
 
@@ -84,6 +85,15 @@
 	 * 鑷畾涔夊垎椤�
 	 *
 	 * @param user
+	 * @param deptId
+	 * @return
+	 */
+	List<User> selectAllUser(User user, Long deptId);
+
+	/**
+	 * 鑷畾涔夊垎椤�
+	 *
+	 * @param user
 	 * @param query
 	 * @return
 	 */
@@ -105,6 +115,15 @@
 	 * @return
 	 */
 	UserInfo userInfo(String tenantId, String account);
+
+	/**
+	 * 鐢ㄦ埛淇℃伅,涓哄暐涓嶅垹浜嗕笂杈归偅涓柟娉曞憿锛屽洜涓烘垜涓嶆暍,鐗垫壇鏈夌偣澶�
+	 *
+	 * @param tenantId
+	 * @param account
+	 * @return
+	 */
+	UserInfo userInfo(String tenantId, String account,String name);
 
 	/**
 	 * 鐢ㄦ埛淇℃伅
@@ -226,4 +245,12 @@
 	 */
 	boolean updateByUseStrategyId(List<Long> userIds);
 
+	/**
+	 * 鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃
+	 * @param user 鐢ㄦ埛鏌ヨ鐨勭敤鎴蜂俊鎭紝濡傜鎴蜂俊鎭紝閫氬父涓鸿嚜鍔ㄦ敞鍏ワ紝鍓嶇鍙�夋嫨涓嶄紶
+	 * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤
+	 * @return
+	 */
+	List<UserVO> getByRoleUserList(BladeUser user, String roleName);
+
 }

--
Gitblit v1.9.3