From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 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 283461c..c3e5613 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -26,6 +26,7 @@
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
+import org.springblade.modules.system.excel.PoliceUserExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.vo.UserDetailVO;
 import org.springblade.modules.system.vo.UserVO;
@@ -72,7 +73,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+	IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId);
 
 	/**
 	 * 自定义分页
@@ -238,10 +239,42 @@
 
 	/**
 	 * 获取用户信息ById
+	 *
 	 * @param id
 	 * @return
 	 */
 	UserVO getuserById(Long id);
 
 	List<UserEntity> getUserInfoByCode(String houseCode, String type);
+
+	List<UserEntity> getUserInfoByDistrictId(String districtId, String building);
+
+	/**
+	 * 处理漏绑定的user_dept
+	 */
+	Object handleUserDept();
+
+	List<User> getUserListByIds(String receiveUser);
+
+	List<User> getUserListByDeptIds(String receiveDept);
+
+	List<User> getUserInfoByPropertyId(String propertyCompanyId,String roleId);
+
+	Object handleUser();
+
+	/**
+	 * 导入民警信息
+	 * @param data
+	 */
+	void importPoliceUser(List<PoliceUserExcel> data);
+
+	List<User> getUserInfoByDistrictIds(String districtIds);
+
+	/**
+	 * 查询500M内的民警
+	 * @param longitude
+	 * @param latitude
+	 * @return
+	 */
+	List<User> getPoliceUser(String longitude, String latitude, String houseCode);
 }

--
Gitblit v1.9.3