From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 20 +++++++++++++++-----
1 files changed, 15 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..0cf22fd 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,9 @@
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.system.entity.User;
+import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.vo.UserDetailVO;
import org.springblade.modules.system.vo.UserVO;
@@ -68,14 +69,14 @@
* @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);
/**
* 根据手机号查询对应账号和手机号的用户信息
@@ -89,12 +90,21 @@
* @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> getUserInfoByPropertyId(String deptId,String roleId);
}
--
Gitblit v1.9.3