bug
This commit is contained in:
+15
-4
@@ -271,10 +271,21 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
|
||||
ExtRepoFolder father = queryById(folder);
|
||||
for (ExtRepoFolder extRepoFolder : listBySupFolder) {
|
||||
ERFTreeData date = new ERFTreeData(extRepoFolder.getFolderName(), extRepoFolder.getId(), childLevel, extRepoFolder.getOrderId());
|
||||
date.setAuthManageIdsName(father.getAuthManageIdsName());
|
||||
date.setAuthManageIds(father.getAuthManageIds());
|
||||
date.setAuthViewIdsName(father.getAuthViewIdsName());
|
||||
date.setAuthViewIds(father.getAuthViewIds());
|
||||
//如果参数为空则延续父文件夹权限,反之用自己的
|
||||
if (ObjectUtils.isNotEmpty(extRepoFolder.getAuthManageIds()) && ObjectUtils.isNotEmpty(extRepoFolder.getAuthManageIdsName())) {
|
||||
date.setAuthManageIdsName(extRepoFolder.getAuthManageIdsName());
|
||||
date.setAuthManageIds(extRepoFolder.getAuthManageIds());
|
||||
} else {
|
||||
date.setAuthManageIdsName(father.getAuthManageIdsName());
|
||||
date.setAuthManageIds(father.getAuthManageIds());
|
||||
}
|
||||
if (ObjectUtils.isNotEmpty(extRepoFolder.getAuthViewIds()) && ObjectUtils.isNotEmpty(extRepoFolder.getAuthViewIdsName())) {
|
||||
date.setAuthViewIdsName(extRepoFolder.getAuthViewIdsName());
|
||||
date.setAuthViewIds(extRepoFolder.getAuthViewIds());
|
||||
} else {
|
||||
date.setAuthViewIdsName(father.getAuthViewIdsName());
|
||||
date.setAuthViewIds(father.getAuthViewIds());
|
||||
}
|
||||
date.setChildren(subFolderTree(extRepoFolder.getId(), new ArrayList<ERFTreeData>(),childLevel));
|
||||
date.sortChildren();
|
||||
childTree.add(date);
|
||||
|
||||
Reference in New Issue
Block a user