From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   80 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 3 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 6ae4d14..9ca8d96 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,8 @@
 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.flowable.idm.engine.impl.persistence.entity.UserEntity;
 import org.springblade.common.cache.DictCache;
 import org.springblade.common.cache.ParamCache;
 import org.springblade.common.cache.SysCache;
@@ -40,6 +42,8 @@
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.*;
 import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.grid.service.IGridmanService;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
 import org.springblade.modules.system.entity.*;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.mapper.UserMapper;
@@ -47,6 +51,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;
@@ -123,7 +128,8 @@
 	@Override
 	public boolean updateUserInfo(User user) {
 		user.setPassword(null);
-		return updateById(user);
+		boolean b = updateById(user);
+		return b;
 	}
 
 	private boolean submitUserDept(User user) {
@@ -136,12 +142,13 @@
 			userDeptList.add(userDept);
 		});
 		userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
-		return userDeptService.saveBatch(userDeptList);
+		boolean b = userDeptService.saveBatch(userDeptList);
+		return b;
 	}
 
 	@Override
 	public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
-		if (null == deptId && !AuthUtil.isAdministrator()){
+		if (null == deptId && !AuthUtil.isAdministrator()) {
 			deptId = Long.parseLong(AuthUtil.getDeptId());
 		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
@@ -429,4 +436,71 @@
 		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;
+	}
+
+	@Override
+	public UserVO getuserById(Long id) {
+		return baseMapper.searchUserById(id);
+	}
+
+	@Override
+	public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
+		if (type.equals("1")) {
+			IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
+			return bean.getGridManByCode(houseCode);
+		} else {
+			IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+			return bean1.getDistictUserByCode(houseCode);
+		}
+	}
 }

--
Gitblit v1.9.3