From ebd41b7b2e44dc8b96f177d7bf88d2f5f997b75c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 28 Apr 2024 14:30:07 +0800
Subject: [PATCH] 民警导入修改

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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 8c1e416..e46f227 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;
@@ -117,6 +118,17 @@
 	 * @param tenantId
 	 * @param account
 	 * @param password
+	 * @param type 登录类型 2：pc 3：app
+	 * @return
+	 */
+	UserInfo userInfo(String tenantId, String account, String password, Integer type);
+
+	/**
+	 * 用户信息
+	 *
+	 * @param tenantId
+	 * @param account
+	 * @param password
 	 * @param userEnum
 	 * @return
 	 */
@@ -181,7 +193,7 @@
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<UserExcel> exportUser(Wrapper<User> queryWrapper);
+	List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId);
 
 	/**
 	 * 注册用户
@@ -268,15 +280,6 @@
 	 */
 	void importPoliceUser(List<PoliceUserExcel> data);
 
-	/**
-	 * 通过小区id查询用户
-	 * @param districtIds
-	 * @param building
-	 * @param unit
-	 * @param name
-	 * @return
-	 */
-	IPage<User> getUserInfoByDistrictIds(String districtIds,String building,String unit,String name,IPage<User> page);
 
 	/**
 	 * 查询500M内的民警

--
Gitblit v1.9.3