From 2af148a7b15f1273d12be7b910bc6d9e4e41d2c2 Mon Sep 17 00:00:00 2001 From: lin <sbla5888@163.com> Date: Wed, 17 Apr 2024 16:20:29 +0800 Subject: [PATCH] 住户删除不能排除 --- src/main/java/org/springblade/modules/system/service/IUserService.java | 14 ++++++++++++-- 1 files changed, 12 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 7cb0f24..7f61797 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; @@ -73,7 +74,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); /** * 自定义分页 @@ -181,7 +182,7 @@ * @param queryWrapper * @return */ - List<UserExcel> exportUser(Wrapper<User> queryWrapper); + List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId); /** * 注册用户 @@ -267,4 +268,13 @@ * @param data */ void importPoliceUser(List<PoliceUserExcel> data); + + + /** + * 查询500M内的民警 + * @param longitude + * @param latitude + * @return + */ + List<User> getPoliceUser(String longitude, String latitude, String houseCode); } -- Gitblit v1.9.3