From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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..af293dc 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.vo.UserDetailVO;
@@ -62,10 +63,11 @@
* @param queryWrapper
* @return
*/
- List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper,@Param("deptIdList") List<Long> deptIdList);
/**
* 按条件查询用户信息
+ *
* @param user
* @return
*/
@@ -73,6 +75,7 @@
/**
* 通过小区Id搜索用户
+ *
* @param districtId
* @return
*/
@@ -80,6 +83,7 @@
/**
* 根据手机号查询对应账号和手机号的用户信息
+ *
* @param phoneNumber
* @return
*/
@@ -87,6 +91,7 @@
/**
* 用户详情接口
+ *
* @param userId
* @return
*/
@@ -102,9 +107,30 @@
/**
* 查询没有匹配的数据
+ *
* @return
*/
List<User> getNotBindUserDept();
- List<User> getUserInfoByPropertyId(String deptId);
+ List<User> getUserListByDeptIds(@Param("deptIds") String receiveDept);
+
+ List<User> getUserInfoByPropertyId(String deptId, String roleId);
+
+
+ /**
+ * 通过机构查询用户
+ *
+ * @param deptIdList
+ * @return
+ */
+ List<UserEntity> selectUserByDept(List<Long> deptIdList);
+
+ /**
+ * 通过经纬度查询最近的民警人员
+ *
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ List<User> getPoliceUser(String longitude, String latitude);
}
--
Gitblit v1.9.3