mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2024-12-27 05:30:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: log group bug

Browse Source
This commit is contained in:
suxiaoxin 2017-10-10 11:34:33 +08:00
parent 375a4d7822
commit 0aa0598926
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/controllers/log.js
View File

@ -39,11 +39,20 @@ class logController extends baseController {
try {
if(type === "group"){
let projectList = await this.projectModel.list(typeid);
let projectIds = [], projectDatas = {};
for(let i in projectList){
projectList[i] = projectList[i]._id;
projectDatas[projectList[i]._id] = projectList[i];
projectIds[i] = projectList[i]._id;
}
let projectLogList = await this.Model.listWithPagingByGroup(typeid,projectList,page,limit);
let total = await this.Model.listCountByGroup(typeid,projectList);
let projectLogList = await this.Model.listWithPagingByGroup(typeid,projectIds,page,limit);
projectLogList.forEach((item, index)=>{
item = item.toObject();
if(item.type === 'project'){
item.content = `在 ${projectDatas[item.typeid].name} 项目: ` + item.content;
}
projectLogList[index] = item;
})
let total = await this.Model.listCountByGroup(typeid,projectIds);
ctx.body = yapi.commons.resReturn({
list: projectLogList,
total: Math.ceil(total / limit)

2
server/controllers/project.js
View File

@ -135,7 +135,7 @@ class projectController extends baseController {
let username = this.getUsername();
yapi.commons.saveLog({
content: `用户 "${username}" 添加了项目 "${params.name}"`,
type: 'project',
type: 'group',
uid: this.getUid(),
username: username,
typeid: params.group_id