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 |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 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 1f84fc8..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;
 
 /**
  * 鏈嶅姟绫�
@@ -84,11 +86,25 @@
 	 * 鑷畾涔夊垎椤�
 	 *
 	 * @param user
+	 * @param deptId
+	 * @return
+	 */
+	List<User> selectAllUser(User user, Long deptId);
+
+	/**
+	 * 鑾峰彇鎵�鏈�
+	 * @return
+	 */
+	List<User>  selectAllUser();
+
+	/**
+	 * 鑷畾涔夊垎椤�
+	 *
+	 * @param user
 	 * @param query
 	 * @return
 	 */
 	IPage<UserVO> selectUserSearch(UserVO user, Query query);
-
 
 	/**
 	 * 鐢ㄦ埛淇℃伅
@@ -106,6 +122,15 @@
 	 * @return
 	 */
 	UserInfo userInfo(String tenantId, String account);
+
+	/**
+	 * 鐢ㄦ埛淇℃伅,涓哄暐涓嶅垹浜嗕笂杈归偅涓柟娉曞憿锛屽洜涓烘垜涓嶆暍,鐗垫壇鏈夌偣澶�
+	 *
+	 * @param tenantId
+	 * @param account
+	 * @return
+	 */
+	UserInfo userInfo(String tenantId, String account,String name);
 
 	/**
 	 * 鐢ㄦ埛淇℃伅
@@ -220,4 +245,19 @@
 	 */
 	Long checkRenAndExpr(Long userId);
 
+	/**
+	 * 鍥犲瘑鐮佺瓥鐣ヤ慨鏀规垨榛樿瀵嗙爜绛栫暐琚慨鏀癸紝鎵�浠ョ敤鎴风姸鎬佹彁閱掍篃闇�鍋氱浉搴旂殑鏇存敼
+	 * @param userIds
+	 * @return
+	 */
+	boolean updateByUseStrategyId(List<Long> userIds);
+
+	/**
+	 * 鑾峰彇鍒版寚瀹氳韩浠芥潈闄愮殑鐢ㄦ埛鍒楄〃
+	 * @param user 鐢ㄦ埛鏌ヨ鐨勭敤鎴蜂俊鎭紝濡傜鎴蜂俊鎭紝閫氬父涓鸿嚜鍔ㄦ敞鍏ワ紝鍓嶇鍙�夋嫨涓嶄紶
+	 * @param roleName 瑕佹煡璇㈢殑瑙掕壊韬唤
+	 * @return
+	 */
+	List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName);
+
 }

--
Gitblit v1.9.3