From cffa714da5feb1f94980004db6aba89f720e8a4d Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 15 Aug 2022 14:01:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=AF=B9?= =?UTF-8?q?=E6=AF=94-=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E5=92=8C?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extRepo/service/impl/ExtRepoFolderServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java index baee6ebaa..30df6c310 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java @@ -222,7 +222,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl queryTreeList() { try { List list = queryList(); - List res = getSubFolder(superFolder, list, 1, true); + List res = getSubFolder(superFolder, list, 1); Collections.sort(res); return res; } catch (Exception ex) { @@ -235,22 +235,22 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl getSubFolder(String supId, List list, int level, boolean needAuth) { + private List getSubFolder(String supId, List list, int level) { List resList = new ArrayList<>(); for (ExtRepoFolder erf : list) { if (supId.equals(erf.getSupFolder())) { int childLevel = level + 1; - if (!needAuth || haveViewAuth(erf.getId())) { + if (haveViewAuth(erf.getId())) { ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); date.setAuthManageIdsName(erf.getAuthManageIdsName()); date.setAuthManageIds(erf.getAuthManageIds()); date.setAuthViewIdsName(erf.getAuthViewIdsName()); date.setAuthViewIds(erf.getAuthViewIds()); - date.setChildren(getSubFolder(erf.getId(), list, childLevel, false)); + date.setChildren(getSubFolder(erf.getId(), list, childLevel)); date.sortChildren(); resList.add(date); } else { - resList.addAll(getSubFolder(erf.getId(), list, childLevel, true)); + resList.addAll(getSubFolder(erf.getId(), list, childLevel)); } } }