From 8e07e4dd8a1086a68bdb3d28a7f23e1b893b0740 Mon Sep 17 00:00:00 2001 From: s2042968 Date: Fri, 21 Mar 2025 15:08:27 +0800 Subject: [PATCH 1/2] =?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 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; + } } From bea84f57c2d231de6f2bc2d2152da73e9b8757d7 Mon Sep 17 00:00:00 2001 From: s2042968 Date: Fri, 21 Mar 2025 15:30:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/serviceimpl/FileFormatServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 getList() { - List fileFormats = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByDesc(FileFormat::getCreatedTime)); + List fileFormats = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByAsc(FileFormat::getSuffixNo)); List fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class); UserThreadLocal.setSuccessInfo("", "", "查询了文件格式列表"); return fileFormatVOS;