WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
CD
2022-10-11 11:25:03 +08:00
parent b4bd2686f0
commit 4d24e93f98
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java
+8 -11
View File
@@ -241,7 +241,6 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
List<ERFTreeData> resList = new ArrayList<>(); List<ERFTreeData> resList = new ArrayList<>();
for (ExtRepoFolder erf : list) { for (ExtRepoFolder erf : list) {
if (supId.equals(erf.getSupFolder())) { if (supId.equals(erf.getSupFolder())) {
//int childLevel = level + 1;
if (haveViewAuth(erf.getId())) { if (haveViewAuth(erf.getId())) {
ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId()); ERFTreeData date = new ERFTreeData(erf.getFolderName(), erf.getId(), level, erf.getOrderId());
boolean parentRightClick = haveManageAuth(erf.getId()); boolean parentRightClick = haveManageAuth(erf.getId());
@@ -252,7 +251,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
date.setAuthManageIds(erf.getAuthManageIds()); date.setAuthManageIds(erf.getAuthManageIds());
date.setAuthViewIdsName(erf.getAuthViewIdsName()); date.setAuthViewIdsName(erf.getAuthViewIdsName());
date.setAuthViewIds(erf.getAuthViewIds()); date.setAuthViewIds(erf.getAuthViewIds());
date.setChildren(subFolderTree(erf.getId(),new ArrayList<ERFTreeData>(),level,parentRightClick)); date.setChildren(subFolderTree(new ArrayList<ERFTreeData>(),date));
date.sortChildren(); date.sortChildren();
resList.add(date); resList.add(date);
} else { } else {
@@ -265,20 +264,18 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
/** /**
* 父文件夹有权限则获取其下全部子文件夹 * 父文件夹有权限则获取其下全部子文件夹
* @param folder * @param childTree
* @param level * @param father
* @return * @return
*/ */
private List<ERFTreeData> subFolderTree(String folder,List<ERFTreeData> childTree,int level,boolean parentRightClick) { private List<ERFTreeData> subFolderTree(List<ERFTreeData> childTree,ERFTreeData father) {
int childLevel = level + 1; int childLevel = father.getLevel() + 1;
List<ExtRepoFolder> listBySupFolder = getListBySupFolder(folder); List<ExtRepoFolder> listBySupFolder = getListBySupFolder(father.getKey());
ExtRepoFolder father = queryById(folder);
for (ExtRepoFolder extRepoFolder : listBySupFolder) { for (ExtRepoFolder extRepoFolder : listBySupFolder) {
ERFTreeData date = new ERFTreeData(extRepoFolder.getFolderName(), extRepoFolder.getId(), childLevel, extRepoFolder.getOrderId()); ERFTreeData date = new ERFTreeData(extRepoFolder.getFolderName(), extRepoFolder.getId(), childLevel, extRepoFolder.getOrderId());
//是否有管理权限 //是否有管理权限
boolean childRightClick = haveManageAuth(extRepoFolder.getId()); boolean childRightClick = haveManageAuth(extRepoFolder.getId());
if (parentRightClick||childRightClick) { if (father.isManager()||childRightClick) {
childRightClick = true;
date.setManager(true); date.setManager(true);
} }
//如果参数为空则延续父文件夹权限，反之用自己的 //如果参数为空则延续父文件夹权限，反之用自己的
@@ -296,7 +293,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
date.setAuthViewIdsName(father.getAuthViewIdsName()); date.setAuthViewIdsName(father.getAuthViewIdsName());
date.setAuthViewIds(father.getAuthViewIds()); date.setAuthViewIds(father.getAuthViewIds());
} }
date.setChildren(subFolderTree(extRepoFolder.getId(), new ArrayList<ERFTreeData>(),childLevel,childRightClick)); date.setChildren(subFolderTree(new ArrayList<ERFTreeData>(),date));
date.sortChildren(); date.sortChildren();
childTree.add(date); childTree.add(date);
} }