bug
This commit is contained in:
+3
-3
@@ -241,7 +241,7 @@ 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;
|
//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,11 +252,11 @@ 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>(),childLevel,parentRightClick));
|
date.setChildren(subFolderTree(erf.getId(),new ArrayList<ERFTreeData>(),level,parentRightClick));
|
||||||
date.sortChildren();
|
date.sortChildren();
|
||||||
resList.add(date);
|
resList.add(date);
|
||||||
} else {
|
} else {
|
||||||
resList.addAll(getSubFolder(erf.getId(), list, childLevel));
|
resList.addAll(getSubFolder(erf.getId(), list, level));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user