From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 674e15c..43e22fe 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -66,6 +66,7 @@
/**
* 按条件查询用户信息
+ *
* @param user
* @return
*/
@@ -73,6 +74,7 @@
/**
* 通过小区Id搜索用户
+ *
* @param districtId
* @return
*/
@@ -80,6 +82,7 @@
/**
* 根据手机号查询对应账号和手机号的用户信息
+ *
* @param phoneNumber
* @return
*/
@@ -87,6 +90,7 @@
/**
* 用户详情接口
+ *
* @param userId
* @return
*/
@@ -102,9 +106,27 @@
/**
* 查询没有匹配的数据
+ *
* @return
*/
List<User> getNotBindUserDept();
- List<User> getUserInfoByPropertyId(String deptId);
+ List<User> getUserListByDeptIds(@Param("deptIds") String receiveDept);
+
+ List<User> getUserInfoByPropertyId(String deptId, String roleId);
+
+ /**
+ *
+ * 多个小区id查询用户
+ * @param list
+ * @return
+ */
+ List<User> getUserInfoByDistrictIds(@Param("list") List<String> list);
+
+ /**
+ * 通过机构查询用户
+ * @param deptIdList
+ * @return
+ */
+ List<UserEntity> selectUserByDept(List<Long> deptIdList);
}
--
Gitblit v1.9.3