mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-02-23 13:59:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 分组项目添加成员

Browse Source
This commit is contained in:
zwjamnsss 2017-09-27 20:11:04 +08:00
parent 1bfdeff722
commit 5751e3aaeb
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/controllers/group.js
View File

@ -80,9 +80,9 @@ class groupController extends baseController {
} }
} }
// groupUserdata = await this.getUserdata(params.owner_uid, 'owner'); // groupUserdata = await this.getUserdata(params.owner_uid, 'owner');
if (!owners.length) { // if (!owners.length) {
return ctx.body = yapi.commons.resReturn(null, 400, '组长uid不存在') // return ctx.body = yapi.commons.resReturn(null, 400, '组长uid不存在')
} // }
let groupInst = yapi.getInst(groupModel); let groupInst = yapi.getInst(groupModel);
@ -162,7 +162,6 @@ class groupController extends baseController {
let id = params.member_uids[i]; let id = params.member_uids[i];
let check = await groupInst.checkMemberRepeat(params.id, id); let check = await groupInst.checkMemberRepeat(params.id, id);
let userdata = await this.getUserdata(id, params.role); let userdata = await this.getUserdata(id, params.role);
console.log(userdata)
if (check > 0) { if (check > 0) {
exist_members.push(userdata) exist_members.push(userdata)
} else if (!userdata) { } else if (!userdata) {

11
server/controllers/project.js
View File

@ -175,17 +175,18 @@ class projectController extends baseController {
let add_members = []; let add_members = [];
let exist_members = []; let exist_members = [];
let no_members = [] let no_members = []
params.member_uids.forEach(async id => { for(let i = 0, len = params.member_uids.length; i < len; i++) {
let id = params.member_uids[i]
let check = await this.Model.checkMemberRepeat(params.id, id); let check = await this.Model.checkMemberRepeat(params.id, id);
let userdata = await this.getUserdata(id, params.role); let userdata = await this.getUserdata(id, params.role);
if (!check) { if (check > 0) {
exist_members.push(userdata) exist_members.push(userdata)
} else if (!userdata) { } else if (!userdata) {
no_members.push(id) no_members.push(id)
} else { } else {
add_members.push(userdata) add_members.push(userdata)
} }
}); }
// var check = await this.Model.checkMemberRepeat(params.id, params.member_uids); // var check = await this.Model.checkMemberRepeat(params.id, params.member_uids);
// if (check > 0) { // if (check > 0) {
@ -195,8 +196,8 @@ class projectController extends baseController {
// params.role = ['owner', 'dev', 'guest'].find(v => v === params.role) || 'dev'; // params.role = ['owner', 'dev', 'guest'].find(v => v === params.role) || 'dev';
// let userdata = await this.getUserdata(params.member_uid, params.role); // let userdata = await this.getUserdata(params.member_uid, params.role);
// if (userdata === null) { // if (!add_members.length) {
// // return ctx.body = yapi.commons.resReturn(null, 400, '成员uid不存在') // return ctx.body = yapi.commons.resReturn(null, 400, '成员uid不存在')
// } // }

3
server/models/project.js
View File

@ -113,7 +113,8 @@ class projectModel extends baseModel {
{ {
_id: id _id: id
}, { }, {
$push: { members: data } // $push: { members: data }
$push: { members: { $each: data } }
} }
); );
} }