修改文档对比-修改排序和模糊搜索
This commit is contained in:
+5
-5
@@ -222,7 +222,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
|
|||||||
public List<ERFTreeData> queryTreeList() {
|
public List<ERFTreeData> queryTreeList() {
|
||||||
try {
|
try {
|
||||||
List<ExtRepoFolder> list = queryList();
|
List<ExtRepoFolder> list = queryList();
|
||||||
List<ERFTreeData> res = getSubFolder(superFolder, list, 1, true);
|
List<ERFTreeData> res = getSubFolder(superFolder, list, 1);
|
||||||
Collections.sort(res);
|
Collections.sort(res);
|
||||||
return res;
|
return res;
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
@@ -235,22 +235,22 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
|
|||||||
/**
|
/**
|
||||||
* 查找子文件夹,生成树结构
|
* 查找子文件夹,生成树结构
|
||||||
*/
|
*/
|
||||||
private List<ERFTreeData> getSubFolder(String supId, List<ExtRepoFolder> list, int level, boolean needAuth) {
|
private List<ERFTreeData> getSubFolder(String supId, List<ExtRepoFolder> list, int level) {
|
||||||
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 (!needAuth || 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());
|
||||||
date.setAuthManageIdsName(erf.getAuthManageIdsName());
|
date.setAuthManageIdsName(erf.getAuthManageIdsName());
|
||||||
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(getSubFolder(erf.getId(), list, childLevel, false));
|
date.setChildren(getSubFolder(erf.getId(), list, childLevel));
|
||||||
date.sortChildren();
|
date.sortChildren();
|
||||||
resList.add(date);
|
resList.add(date);
|
||||||
} else {
|
} else {
|
||||||
resList.addAll(getSubFolder(erf.getId(), list, childLevel, true));
|
resList.addAll(getSubFolder(erf.getId(), list, childLevel));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user