From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 |   22 +++++++++++++++++++++-
 1 files changed, 21 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 aa94f68..9408399 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, String deptIds, String tenantId);
+
+	List<UserVO> getAllUser(UserVO user, Long deptId, String tenantId);
+
 
 	/**
 	 * 自定义分页
@@ -215,4 +218,21 @@
 	 * @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);
+
+	/**
+	 * 根据行政区划获取系统用户人数
+	 * @param adCode
+	 * @return
+	 */
+	int getSysUserNum(String adCode);
 }

--
Gitblit v1.9.3