From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 1785953..a8153a0 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -23,6 +23,7 @@
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.house.vo.HouseholdVO;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
@@ -268,7 +269,15 @@
 	 */
 	void importPoliceUser(List<PoliceUserExcel> data);
 
-	List<User> getUserInfoByDistrictIds(String districtIds);
+	/**
+	 * 通过小区id查询用户
+	 * @param districtIds
+	 * @param building
+	 * @param unit
+	 * @param name
+	 * @return
+	 */
+	IPage<HouseholdVO> getUserInfoByDistrictIds(String districtIds,String building,String unit,String name,IPage<HouseholdVO> page);
 
 	/**
 	 * 查询500M内的民警
@@ -276,5 +285,5 @@
 	 * @param latitude
 	 * @return
 	 */
-	List<User> getPoliceUser(String longitude, String latitude);
+	List<User> getPoliceUser(String longitude, String latitude, String houseCode);
 }

--
Gitblit v1.9.3