From a5c2a3b99f46866a666618bc461340aa4e679b1c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 11:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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..60521eb 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;
@@ -238,10 +239,28 @@
 
 	/**
 	 * 获取用户信息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> getUserInfoByPropertyId(String propertyCompanyId,String roleId);
+
+	Object handleUser();
+
+	/**
+	 * 导入民警信息
+	 * @param data
+	 */
+	void importPoliceUser(List<PoliceUserExcel> data);
 }

--
Gitblit v1.9.3