diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
index e60a688..beff925 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
@@ -76,7 +76,7 @@ public class FileFormatServiceImpl extends ServiceImpl<FileFormatMapper, FileFor
      */
     @Override
     public List<FileFormatVO> getList() {
-        List<FileFormat> fileFormats = this.baseMapper.selectList(Wrappers.<FileFormat>lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByDesc(FileFormat::getCreatedTime));
+        List<FileFormat> fileFormats = this.baseMapper.selectList(Wrappers.<FileFormat>lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByAsc(FileFormat::getSuffixNo));
         List<FileFormatVO> fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class);
         UserThreadLocal.setSuccessInfo("", "", "查询了文件格式列表");
         return fileFormatVOS;
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;
+    }
 }