From 8e07e4dd8a1086a68bdb3d28a7f23e1b893b0740 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Fri, 21 Mar 2025 15:08:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/RoleServiceImpl.java  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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<RoleMapper, Role> implements Ro
         roleDTO.setRoleName(role.getRoleName());
         roleDTO.setRoleDesc(role.getRoleDesc());
 
-        List<EdFileInfo> infos = getFiles(DataOwnEnum.SYS_PRJ.code);
+        List<EdFileInfo> infos = getSysAndRepo();
 
         List<RolePermissionDTO> nodes = new ArrayList<>();
         for (EdFileInfo info : infos) {
@@ -271,11 +271,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     @Override
     public RoleDTO getRoleTemplate() {
         RoleDTO roleDTO = new RoleDTO();
-
-        List<EdFileInfo> sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code);
-        List<EdFileInfo> repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code);
-        List<EdFileInfo> infos = new ArrayList<>(sysInfos);
-        infos.addAll(repoInfos);
+        List<EdFileInfo> infos = getSysAndRepo();
         List<RolePermissionDTO> nodes = new ArrayList<>();
         for (EdFileInfo info : infos) {
             RolePermissionDTO rolePermissionDTO = new RolePermissionDTO();
@@ -380,5 +376,17 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
                         .or()
                         .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code)));
     }
+
+    /**
+     * 获取系统层级和库层级
+     * @return
+     */
+    private List<EdFileInfo> getSysAndRepo() {
+        List<EdFileInfo> sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code);
+        List<EdFileInfo> repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code);
+        List<EdFileInfo> infos = new ArrayList<>(sysInfos);
+        infos.addAll(repoInfos);
+        return infos;
+    }
 }