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

【fix sonar】 SysUserServiceImpl.java文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-07 14:21:46 +08:00
parent 3295c155cd
commit caf6bb702c
1 changed files with 11 additions and 7 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/SysUserServiceImpl.java
+11 -7
View File
@@ -198,7 +198,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
permissionSet.add(po.getPerms()); permissionSet.add(po.getPerms());
} }
} }
log.info("-------通过数据库读取用户拥有的权限Perms------username： "+ username+",Perms size: "+ (permissionSet==null?0:permissionSet.size()) ); log.info("-------通过数据库读取用户拥有的权限Perms------username： "+ username+",Perms size: "+ (permissionSet.isEmpty()?0:permissionSet.size()) );
return permissionSet; return permissionSet;
} }
@@ -215,9 +215,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} }
//多部门支持in查询 //多部门支持in查询
List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
List<String> sysMultiOrgCode = new ArrayList<String>(); List<SysDepart> list = null;
if(list==null || list.size()==0) { if (user!=null) {
list = sysDepartMapper.queryUserDeparts(user.getId());
}
List<String> sysMultiOrgCode = new ArrayList<>();
if(list==null || list.isEmpty()) {
//当前用户无部门 //当前用户无部门
//sysMultiOrgCode.add("0"); //sysMultiOrgCode.add("0");
}else if(list.size()==1) { }else if(list.size()==1) {
@@ -248,7 +252,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public Map<String, String> getDepNamesByUserIds(List<String> userIds) { public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
List<SysUserDepNameVo> userDeplist = this.baseMapper.getDepNamesByUserIds(userIds); List<SysUserDepNameVo> userDeplist = this.baseMapper.getDepNamesByUserIds(userIds);
Map<String, String> res = new HashMap<String, String>(); Map<String, String> res = new HashMap<>();
userDeplist.forEach(item -> { userDeplist.forEach(item -> {
if (res.get(item.getUserId()) == null) { if (res.get(item.getUserId()) == null) {
res.put(item.getUserId(), item.getDepartName()); res.put(item.getUserId(), item.getDepartName());
@@ -269,7 +273,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public Map<String, String> getRoleNamesByUserIds(List<String> userIds) { public Map<String, String> getRoleNamesByUserIds(List<String> userIds) {
List<SysUserRoleNameVo> userRolelist = this.baseMapper.getRoleNamesByUserIds(userIds); List<SysUserRoleNameVo> userRolelist = this.baseMapper.getRoleNamesByUserIds(userIds);
Map<String, String> res = new HashMap<String, String>(); Map<String, String> res = new HashMap<>();
userRolelist.forEach(item -> { userRolelist.forEach(item -> {
if (res.get(item.getUserId()) == null) { if (res.get(item.getUserId()) == null) {
res.put(item.getUserId(), item.getRoleName()); res.put(item.getUserId(), item.getRoleName());
@@ -368,7 +372,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*/ */
@Override @Override
public Result<?> checkUserIsEffective(SysUser sysUser) { public Result<?> checkUserIsEffective(SysUser sysUser) {
Result<?> result = new Result<Object>(); Result<?> result = new Result<>();
//情况1：根据用户信息查询，该用户不存在 //情况1：根据用户信息查询，该用户不存在
if (sysUser == null) { if (sysUser == null) {
baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null); baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);