KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】 SysUserDepartServiceImpl.java文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-07 11:53:24 +08:00
parent 5b8c5ac5bd
commit 84ffbd2030
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserDepartServiceImpl.java
+23 -25
View File
@@ -1,15 +1,9 @@
package com.jero.modules.system.service.impl; package com.jero.modules.system.service.impl;
import java.util.ArrayList; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUser;
@@ -22,8 +16,11 @@ import com.jero.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.ArrayList;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* <P> * <P>
@@ -45,20 +42,21 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
*/ */
@Override @Override
public List<DepartIdModel> queryDepartIdsOfUser(String userId) { public List<DepartIdModel> queryDepartIdsOfUser(String userId) {
LambdaQueryWrapper<SysUserDepart> queryUDep = new LambdaQueryWrapper<SysUserDepart>(); LambdaQueryWrapper<SysUserDepart> queryUDep = new LambdaQueryWrapper<>();
LambdaQueryWrapper<SysDepart> queryDep = new LambdaQueryWrapper<SysDepart>(); LambdaQueryWrapper<SysDepart> queryDep = new LambdaQueryWrapper<>();
try { try {
queryUDep.eq(SysUserDepart::getUserId, userId); queryUDep.eq(SysUserDepart::getUserId, userId);
List<String> depIdList = new ArrayList<>(); List<String> depIdList = new ArrayList<>();
List<DepartIdModel> depIdModelList = new ArrayList<>(); List<DepartIdModel> depIdModelList = new ArrayList<>();
List<SysUserDepart> userDepList = this.list(queryUDep); List<SysUserDepart> userDepList = this.list(queryUDep);
if(userDepList != null && userDepList.size() > 0) { if(userDepList != null && !userDepList.isEmpty()) {
for(SysUserDepart userDepart : userDepList) { for(SysUserDepart userDepart : userDepList) {
depIdList.add(userDepart.getDepId()); depIdList.add(userDepart.getDepId());
} }
queryDep.in(SysDepart::getId, depIdList); queryDep.in(SysDepart::getId, depIdList);
List<SysDepart> depList = sysDepartService.list(queryDep); List<SysDepart> depList = sysDepartService.list(queryDep);
if(depList != null || depList.size() > 0) { //todo 将此处的||换了 && 如有问题可以改回去
if(depList != null && !depList.isEmpty()) {
for(SysDepart depart : depList) { for(SysDepart depart : depList) {
depIdModelList.add(new DepartIdModel().convertByUserDepart(depart)); depIdModelList.add(new DepartIdModel().convertByUserDepart(depart));
} }
@@ -79,15 +77,15 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
*/ */
@Override @Override
public List<SysUser> queryUserByDepId(String depId) { public List<SysUser> queryUserByDepId(String depId) {
LambdaQueryWrapper<SysUserDepart> queryUDep = new LambdaQueryWrapper<SysUserDepart>(); LambdaQueryWrapper<SysUserDepart> queryUDep = new LambdaQueryWrapper<>();
queryUDep.eq(SysUserDepart::getDepId, depId); queryUDep.eq(SysUserDepart::getDepId, depId);
List<String> userIdList = new ArrayList<>(); List<String> userIdList = new ArrayList<>();
List<SysUserDepart> uDepList = this.list(queryUDep); List<SysUserDepart> uDepList = this.list(queryUDep);
if(uDepList != null && uDepList.size() > 0) { if(uDepList != null && !uDepList.isEmpty()) {
for(SysUserDepart uDep : uDepList) { for(SysUserDepart uDep : uDepList) {
userIdList.add(uDep.getUserId()); userIdList.add(uDep.getUserId());
} }
List<SysUser> userList = (List<SysUser>) sysUserService.listByIds(userIdList); List<SysUser> userList = sysUserService.listByIds(userIdList);
//update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息 //update-begin-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息
for (SysUser sysUser : userList) { for (SysUser sysUser : userList) {
sysUser.setSalt(""); sysUser.setSalt("");
@@ -96,7 +94,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
//update-end-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息 //update-end-author:taoyan date:201905047 for:接口调用查询返回结果不能返回密码相关信息
return userList; return userList;
} }
return new ArrayList<SysUser>(); return new ArrayList<>();
} }
/** /**
@@ -109,14 +107,14 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
realname = realname.trim(); realname = realname.trim();
} }
List<SysUser> userList = this.baseMapper.queryDepartUserList(depCode, realname); List<SysUser> userList = this.baseMapper.queryDepartUserList(depCode, realname);
Map<String, SysUser> map = new HashMap<String, SysUser>(); Map<String, SysUser> map = new HashMap<>();
for (SysUser sysUser : userList) { for (SysUser sysUser : userList) {
// 返回的用户数据去掉密码信息 // 返回的用户数据去掉密码信息
sysUser.setSalt(""); sysUser.setSalt("");
sysUser.setPassword(""); sysUser.setPassword("");
map.put(sysUser.getId(), sysUser); map.put(sysUser.getId(), sysUser);
} }
return new ArrayList<SysUser>(map.values()); return new ArrayList<>(map.values());
//update-end-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化 //update-end-author:taoyan date:20210422 for: 根据部门选择用户接口代码优化
} }
@@ -125,7 +123,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
public IPage<SysUser> queryDepartUserPageList(String departId, String username, String realname, int pageSize, int pageNo) { public IPage<SysUser> queryDepartUserPageList(String departId, String username, String realname, int pageSize, int pageNo) {
IPage<SysUser> pageList = null; IPage<SysUser> pageList = null;
// 部门ID不存在 直接查询用户表即可 // 部门ID不存在 直接查询用户表即可
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize); Page<SysUser> page = new Page<>(pageNo, pageSize);
if(oConvertUtils.isEmpty(departId)){ if(oConvertUtils.isEmpty(departId)){
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
if(oConvertUtils.isNotEmpty(username)){ if(oConvertUtils.isNotEmpty(username)){
@@ -138,10 +136,10 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
pageList = this.baseMapper.queryDepartUserPageList(page, sysDepart.getOrgCode(), username, realname); pageList = this.baseMapper.queryDepartUserPageList(page, sysDepart.getOrgCode(), username, realname);
} }
List<SysUser> userList = pageList.getRecords(); List<SysUser> userList = pageList.getRecords();
if(userList!=null && userList.size()>0){ if(userList!=null && !userList.isEmpty()){
List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
Map<String, SysUser> map = new HashMap<String, SysUser>(); Map<String, SysUser> map = new HashMap<>();
if(userIds!=null && userIds.size()>0){ if(userIds!=null && !userIds.isEmpty()){
// 查部门名称 // 查部门名称
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds); Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
userList.forEach(item->{ userList.forEach(item->{
@@ -153,7 +151,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
map.put(item.getId(), item); map.put(item.getId(), item);
}); });
} }
pageList.setRecords(new ArrayList<SysUser>(map.values())); pageList.setRecords(new ArrayList<>(map.values()));
} }
return pageList; return pageList;
} }