mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-03-31 14:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复管理员无法看到所有分组的 bug

Browse Source
This commit is contained in:
苏文雄 2019-08-26 13:42:49 +08:00
parent eee8679e7d
commit 5a9742cd3c
2 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v1.8.3
* 修复管理员无法看到所有分组的 bug
## v1.8.2
* 重构分组列表功能实现，大幅度优化首屏加载速度
* 接口运行界面设置 header、query、form 的初始值为其示例值

77
server/controllers/group.js
View File

@ -401,7 +401,6 @@ class groupController extends baseController {
async list(ctx) {
var groupInst = yapi.getInst(groupModel);
let projectInst = yapi.getInst(projectModel);
let result = await groupInst.getAuthList(this.getUid());
let privateGroup = await groupInst.getByPrivateUid(this.getUid());
let newResult = [];
@ -416,53 +415,41 @@ class groupController extends baseController {
});
}
if(result && result.length > 0 ){
for (let i = 0; i < result.length; i++){
result[i] = result[i].toObject();
newResult.unshift(result[i])
}
}
const groupIds = newResult.map(item=> item._id);
const newGroupIds = [];
let groupByProject = await projectInst.getAuthList(this.getUid());
if(groupByProject && groupByProject.length > 0){
groupByProject.forEach( _data=>{
const _temp = [...groupIds, ...newGroupIds];
if(!_.find(_temp, id=> id === _data.group_id)){
newGroupIds.push(_data.group_id)
if(this.getRole() === 'admin'){
let result = await groupInst.list();
if(result && result.length > 0 ){
for (let i = 0; i < result.length; i++){
result[i] = result[i].toObject();
newResult.unshift(result[i])
}
}
}else{
let result = await groupInst.getAuthList(this.getUid());
if(result && result.length > 0 ){
for (let i = 0; i < result.length; i++){
result[i] = result[i].toObject();
newResult.unshift(result[i])
}
}
const groupIds = newResult.map(item=> item._id);
const newGroupIds = [];
let groupByProject = await projectInst.getAuthList(this.getUid());
if(groupByProject && groupByProject.length > 0){
groupByProject.forEach( _data=>{
const _temp = [...groupIds, ...newGroupIds];
if(!_.find(_temp, id=> id === _data.group_id)){
newGroupIds.push(_data.group_id)
}
})
}
let newData = await groupInst.findByGroups(newGroupIds)
newData.forEach(_data=>{
_data = _data.toObject();
newResult.push(_data);
})
}
let newData = await groupInst.findByGroups(newGroupIds)
newData.forEach(_data=>{
_data = _data.toObject();
newResult.push(_data);
})
// if (result && result.length > 0) {
// for (let i = 0; i < result.length; i++) {
// result[i] = result[i].toObject();
// result[i].role = await this.getProjectRole(result[i]._id, 'group');
// if (result[i].role !== 'member') {
// newResult.unshift(result[i]);
// } else {
// let publicCount = await projectInst.countWithPublic(result[i]._id);
// if (publicCount > 0) {
// newResult.push(result[i]);
// } else {
// let projectCountWithAuth = await projectInst.getProjectWithAuth(
// result[i]._id,
// this.getUid()
// );
// if (projectCountWithAuth > 0) {
// newResult.push(result[i]);
// }
// }
// }
// }
// }
if (privateGroup) {
privateGroup = privateGroup.toObject();
privateGroup.group_name = '个人空间';