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/mapper/UserMapper.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index d92cf62..4ff5e8a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -20,8 +20,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.system.excel.UserExcel;
+import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.vo.UserDetailVO;
import org.springblade.modules.system.vo.UserVO;
@@ -65,20 +67,23 @@
/**
* 按条件查询用户信息
+ *
* @param user
* @return
*/
- List<UserVO> getUserListByParam(@Param("user") UserVO user);
+ List<UserVO> getUserListByParam(@Param("user") UserVO user);
/**
* 通过小区Id搜索用户
+ *
* @param districtId
* @return
*/
- List<User> searchUserByDistrictId(String districtId);
+ List<User> searchUserByDistrictId(String districtId);
/**
* 根据手机号查询对应账号和手机号的用户信息
+ *
* @param phoneNumber
* @return
*/
@@ -86,15 +91,53 @@
/**
* 用户详情接口
+ *
* @param userId
* @return
*/
- UserDetailVO getUserInfo(@Param("userId") Long userId);
+ UserDetailVO getUserInfo(@Param("userId") Long userId);
/**
- *
* @param id
* @return
*/
UserVO searchUserById(Long id);
+
+ List<UserEntity> getUserInfoByDistrictId(String districtId, String building);
+
+ /**
+ * 查询没有匹配的数据
+ *
+ * @return
+ */
+ List<User> getNotBindUserDept();
+
+ List<User> getUserListByDeptIds(@Param("deptIds") String receiveDept);
+
+ List<User> getUserInfoByPropertyId(String deptId, String roleId);
+
+ /**
+ * 多个小区id查询用户
+ *
+ * @param list
+ * @return
+ */
+ List<HouseholdVO> getUserInfoByDistrictIds(@Param("list") List<String> list, String building, String unit, String name, IPage<HouseholdVO> page);
+
+ /**
+ * 通过机构查询用户
+ *
+ * @param deptIdList
+ * @return
+ */
+ List<UserEntity> selectUserByDept(List<Long> deptIdList);
+
+ /**
+ * 通过经纬度查询最近的民警人员
+ *
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ List<User> getPoliceUser(String longitude, String latitude);
}
--
Gitblit v1.9.3