From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 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 3935273..af293dc 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,12 @@
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;
import java.util.List;
@@ -59,6 +63,74 @@
* @param queryWrapper
* @return
*/
- List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper);
+ List<UserExcel> exportUser(@Param("ew") Wrapper<User> queryWrapper,@Param("deptIdList") List<Long> deptIdList);
+ /**
+ * 按条件查询用户信息
+ *
+ * @param user
+ * @return
+ */
+ List<UserVO> getUserListByParam(@Param("user") UserVO user);
+
+ /**
+ * 通过小区Id搜索用户
+ *
+ * @param districtId
+ * @return
+ */
+ List<User> searchUserByDistrictId(String districtId);
+
+ /**
+ * 根据手机号查询对应账号和手机号的用户信息
+ *
+ * @param phoneNumber
+ * @return
+ */
+ List<User> getUserListByPhoneOrAccount(@Param("phoneNumber") String phoneNumber);
+
+ /**
+ * 用户详情接口
+ *
+ * @param userId
+ * @return
+ */
+ 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);
+
+
+ /**
+ * 通过机构查询用户
+ *
+ * @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