From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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..12b4885 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;
@@ -123,7 +124,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,7 +138,8 @@
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
@@ -429,4 +432,28 @@
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);
+ }
}
--
Gitblit v1.9.3