From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java
index 872ed86..8dbced0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java
@@ -70,7 +70,10 @@
 	 * @param tenantId
 	 * @return
 	 */
-	IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+	IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
+
+	List<UserVO> getAllUser(UserVO user, Long deptId, String tenantId);
+
 
 	/**
 	 * 自定义分页
@@ -205,4 +208,25 @@
 	 * @return
 	 */
 	UserVO platformDetail(User user);
+
+    List<User> customizeGetList(UserVO user);
+
+	/**
+	 * 根据手机号码查询用户信息
+	 * @param tenantId
+	 * @param phone
+	 * @return
+	 */
+	List<User> userInfoByPhone(String tenantId, String phone);
+
+	/**
+	 * 根据手机号码或者账户查询用户信息
+	 * @param tenantId 租户id
+	 * @param key 账户或者手机号
+	 * @return
+	 */
+	List<User> userInfoByPhoneOrAccount(String tenantId, String key);
+
+    List<User> getUserByPhoneIds(String phoneIds);
+
 }

--
Gitblit v1.9.3