From 46b833a0f8bb135fdd885ad5960d9c4e2d72def0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 25 May 2023 16:46:38 +0800
Subject: [PATCH] 用户列表查询修改(新增职位关联查询返回)

---
 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java
index 8a2f9e3..dae9123 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.java
@@ -42,7 +42,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+	List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
 
 	/**
 	 * 获取用户
@@ -62,4 +62,14 @@
 	List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
 
     List<User> customizeGetList(@Param("user") UserVO user);
+
+	/**
+	 * 根据手机号码或者账户查询用户信息
+	 * @param tenantId 租户id
+	 * @param key 账户或者手机号
+	 * @return
+	 */
+    List<User> selectUserByPhoneOrAccount(@Param("tenantId")String tenantId, @Param("key")String key);
+
+    List<User> getUserByPhoneIds(@Param("phoneIds") String phoneIds);
 }

--
Gitblit v1.9.3