提交 625da159 作者: obcy

fix

上级 059f9060
...@@ -494,7 +494,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap ...@@ -494,7 +494,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
if (userInfo.getIsAll() == 0){ if (userInfo.getIsAll() == 0){
QueryWrapper<KbAuthorizedUser> query = new QueryWrapper<>(); QueryWrapper<KbAuthorizedUser> query = new QueryWrapper<>();
query.eq("a.id",userInfo.getId()); query.eq("a.id",userInfo.getRoleId());
List<RolePermissonVo> rolePermission = kbRoleMapper.getRolePermission(query); List<RolePermissonVo> rolePermission = kbRoleMapper.getRolePermission(query);
if (CollectionUtil.isNotEmpty(rolePermission)){ if (CollectionUtil.isNotEmpty(rolePermission)){
List<String> collect = rolePermission.stream().map(RolePermissonVo::getPermissionCode).collect(Collectors.toList()); List<String> collect = rolePermission.stream().map(RolePermissonVo::getPermissionCode).collect(Collectors.toList());
......
...@@ -235,6 +235,10 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec ...@@ -235,6 +235,10 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery() List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery()
.eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, userId) .eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, userId)
); );
//有部分资讯权限的节点
List<KbAuthuserKnowledgeprojectMap> collect = list.stream().filter(f -> f.getSign() == 1).collect(Collectors.toList());
List<String> knowProIds = collect.stream().map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId).collect(Collectors.toList());
List<KbKnowledgeProject> allknowProjectPermissId = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery() List<KbKnowledgeProject> allknowProjectPermissId = super.list(Wrappers.<KbKnowledgeProject>lambdaQuery()
.in(KbKnowledgeProject::getId, list.stream().map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId).collect(Collectors.toList())) .in(KbKnowledgeProject::getId, list.stream().map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId).collect(Collectors.toList()))
); );
...@@ -288,6 +292,22 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec ...@@ -288,6 +292,22 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
e.setRoles(roles); e.setRoles(roles);
e.setPermissions(permissionsList); e.setPermissions(permissionsList);
}else {
if (CollectionUtil.isNotEmpty(knowProIds)&&knowProIds.contains(e.getId())){
List<KbRole> roles = new ArrayList<>();
List<KbPermissions> permissions = new ArrayList<>();
KbRole kbRole = new KbRole();
KbPermissions permission = new KbPermissions();
kbRole.setRoleCode("r_look");
kbRole.setRoleName("查看者");
permission.setPermissionName("查看");
permission.setPermissionCode("p_look");
roles.add(kbRole);
permissions.add(permission);
e.setRoles(roles);
e.setPermissions(permissions);
}
} }
}); });
return Result.OK(kbKnowledgeProjects); return Result.OK(kbKnowledgeProjects);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论