From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 e866b2e..374719f 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,5 +90,13 @@
* @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);
}
--
Gitblit v1.9.3