diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java index 2fa239b..d7c61f9 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java @@ -166,7 +166,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro roleDTO.setRoleName(role.getRoleName()); roleDTO.setRoleDesc(role.getRoleDesc()); - List infos = getFiles(DataOwnEnum.SYS_PRJ.code); + List infos = getSysAndRepo(); List nodes = new ArrayList<>(); for (EdFileInfo info : infos) { @@ -271,11 +271,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public RoleDTO getRoleTemplate() { RoleDTO roleDTO = new RoleDTO(); - - List sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code); - List repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code); - List infos = new ArrayList<>(sysInfos); - infos.addAll(repoInfos); + List infos = getSysAndRepo(); List nodes = new ArrayList<>(); for (EdFileInfo info : infos) { RolePermissionDTO rolePermissionDTO = new RolePermissionDTO(); @@ -380,5 +376,17 @@ public class RoleServiceImpl extends ServiceImpl implements Ro .or() .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code))); } + + /** + * 获取系统层级和库层级 + * @return + */ + private List getSysAndRepo() { + List sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code); + List repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code); + List infos = new ArrayList<>(sysInfos); + infos.addAll(repoInfos); + return infos; + } }