Commit 905caff5 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 5926d8ca
...@@ -182,7 +182,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -182,7 +182,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
UserPermissionVo authority; UserPermissionVo authority;
List permissionMapByProject = new ArrayList<>(); List permissionMapByProject = new ArrayList<>();
if (Common.isEmpty(userId)) { if (Common.isEmpty(userId)) {
log.error("获取用户权限失败,缺少用户信息");
return permissionMapByProject; return permissionMapByProject;
} }
...@@ -192,7 +191,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -192,7 +191,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
List<SysUserDeptPermission> tPermissionInfoList = baseMapper.getUserDeptPermissionList(userId); List<SysUserDeptPermission> tPermissionInfoList = baseMapper.getUserDeptPermissionList(userId);
if (Common.isEmpty(tPermissionInfoList)) { if (Common.isEmpty(tPermissionInfoList)) {
log.error("获取用户权限失败,未获取到用户在项目下的权限信息>>用户"+userId);
return permissionMapByProject; return permissionMapByProject;
} }
Set<String> projectNoSet = tPermissionInfoList.stream().map(SysUserDeptPermission::getProjectNo).collect(Collectors.toSet()); Set<String> projectNoSet = tPermissionInfoList.stream().map(SysUserDeptPermission::getProjectNo).collect(Collectors.toSet());
...@@ -206,7 +204,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -206,7 +204,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
// 没有配置部门 // 没有配置部门
if(Common.isEmpty(tPermissionInfo)){ if(Common.isEmpty(tPermissionInfo)){
authority = new UserPermissionVo(); authority = new UserPermissionVo();
log.error("获取用户权限失败,该用户指定项目权限{}", userId);
authority.setHaveAll(false); authority.setHaveAll(false);
continue; continue;
}else { }else {
...@@ -235,7 +232,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -235,7 +232,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
authority.setDepartIdSet(normalDeptIdSet); authority.setDepartIdSet(normalDeptIdSet);
authority.setUserId(userId); authority.setUserId(userId);
} else { } else {
log.error("获取用户权限失败,该用户指定部门权限为空{}", userId);
authority.setHaveAll(false); authority.setHaveAll(false);
continue; continue;
} }
...@@ -244,7 +240,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -244,7 +240,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
if (Common.isNotKong(sysDept)) { if (Common.isNotKong(sysDept)) {
String ancestors = sysDept.getAncestors(); String ancestors = sysDept.getAncestors();
if (Common.isEmpty(ancestors)) { if (Common.isEmpty(ancestors)) {
log.error("获取用户权限失败,该用户所属部门关系为空{}", sysDept);
authority.setHaveAll(false); authority.setHaveAll(false);
continue; continue;
} }
...@@ -258,7 +253,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -258,7 +253,6 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
deptIdSplit = ancestorsSplit[0] + CommonConstants.COMMA_STRING + ancestorsSplit[1] + CommonConstants.COMMA_STRING + ancestorsSplit[2]; deptIdSplit = ancestorsSplit[0] + CommonConstants.COMMA_STRING + ancestorsSplit[1] + CommonConstants.COMMA_STRING + ancestorsSplit[2];
deptId = Long.valueOf(ancestorsSplit[2]); deptId = Long.valueOf(ancestorsSplit[2]);
} else { } else {
log.error("获取用户权限失败,该用户所在部门为顶级部门,未查到权限{}", sysDept);
authority.setHaveAll(false); authority.setHaveAll(false);
continue; continue;
} }
...@@ -279,12 +273,10 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -279,12 +273,10 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
authority.setUserId(userId); authority.setUserId(userId);
//redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority); //redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority);
} else { } else {
log.error("获取用户权限失败,该用户部门及以下权限为空{}", userId);
authority.setHaveAll(false); authority.setHaveAll(false);
continue; continue;
} }
} else { } else {
log.error("获取用户权限失败,该用户所属部门不存在{}", userId);
authority.setHaveAll(false); authority.setHaveAll(false);
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment