|
|
@@ -1676,8 +1676,8 @@ function mergeFolderList(plainFolderList, userHash) { |
|
|
|
const folder = firstCharToLowerCase(upperFolder);
|
|
|
|
hash[folder.id] = folder;
|
|
|
|
folder.listChildren = [];
|
|
|
|
folder.listUser = folder.oldGeneralId.split(',').filter(a => a).map(id => ({...userHash[id]}));
|
|
|
|
folder.manageUser = (folder.oldManager === '0' ? '' : folder.oldManager).split(',').filter(a => a).map(id => userHash[id]);
|
|
|
|
folder.listUser = folder.oldGeneralId.split(',').filter(a => a).map(id => ({...userHash[id]}));
|
|
|
|
folder.manageUser = (folder.oldManager === '0' ? '' : folder.oldManager).split(',').filter(a => a).map(id => ({...userHash[id]}));
|
|
|
|
const parentFolderId = folder.superId;
|
|
|
|
// headList.push(folder);
|
|
|
|
if(parentFolderId === rootFolderId) {
|
|
|
|