From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.java |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 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..0c3f010 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -1,27 +1,11 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.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;
 
@@ -61,24 +45,27 @@
 	 * @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);
+	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 +73,35 @@
 
 	/**
 	 * 用户详情接口
+	 *
 	 * @param userId
 	 * @return
 	 */
-    UserDetailVO getUserInfo(@Param("userId") Long userId);
+	UserDetailVO getUserInfo(@Param("userId") Long userId);
 
 	/**
-	 *
 	 * @param id
 	 * @return
 	 */
 	UserVO searchUserById(Long id);
+
+	/**
+	 * 查询没有匹配的数据
+	 *
+	 * @return
+	 */
+	List<User> getNotBindUserDept();
+
+	List<User> getUserListByDeptIds(@Param("deptIds") String receiveDept);
+
+	List<User> getUserInfoByPropertyId(String deptId, String roleId);
+
+	/**
+	 * 通过经纬度查询最近的民警人员
+	 *
+	 * @param longitude
+	 * @param latitude
+	 * @return
+	 */
+	List<User> getPoliceUser(String longitude, String latitude);
 }

--
Gitblit v1.9.3