From 745aa438226dabcf78c144e6b35bccc00f9e7626 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 16:12:12 +0800
Subject: [PATCH] 新增用户详情查询接口

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 0cc5984..b9b5b09 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -22,6 +22,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.apache.logging.log4j.util.Strings;
 import org.springblade.common.cache.DictCache;
 import org.springblade.common.cache.ParamCache;
 import org.springblade.common.cache.SysCache;
@@ -47,6 +48,7 @@
 import org.springblade.modules.system.service.IUserDeptService;
 import org.springblade.modules.system.service.IUserOauthService;
 import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserDetailVO;
 import org.springblade.modules.system.vo.UserVO;
 import org.springblade.modules.system.wrapper.UserWrapper;
 import org.springframework.stereotype.Service;
@@ -431,4 +433,53 @@
 		return userVO;
 	}
 
+	/**
+	 * 按条件查询用户信息
+	 * @param user
+	 * @return
+	 */
+	@Override
+	public List<UserVO> getUserListByParam(UserVO user) {
+		if (!Strings.isBlank(user.getRoleName())){
+			// 查询对应的角色id
+			String roleIds = roleService.getRoleIds("000000", user.getRoleName());
+			user.setRoleId(roleIds);
+		}
+		return baseMapper.getUserListByParam(user);
+	}
+
+	/**
+	 * 通过小区Id搜索用户
+	 * @param districtId
+	 * @return
+	 */
+	@Override
+	public List<User> searchUserByDistrictId(String districtId) {
+		return baseMapper.searchUserByDistrictId( districtId);
+	}
+
+	/**
+	 * 根据手机号查询对应账号和手机号的用户信息
+	 * @param phoneNumber
+	 * @return
+	 */
+	@Override
+	public List<User> getUserListByPhoneOrAccount(String phoneNumber) {
+		return baseMapper.getUserListByPhoneOrAccount( phoneNumber);
+	}
+
+	/**
+	 * 获取用户信息
+	 * @return
+	 */
+	@Override
+	public UserDetailVO getUserInfo(Long userId) {
+		// 根据用户id 获取用户详情信息
+		UserDetailVO userVO = baseMapper.getUserInfo(userId);
+		if (null!=userVO){
+			userVO.setPassword(null);
+		}
+		// 返回
+		return userVO;
+	}
 }

--
Gitblit v1.9.3