Merge branch 'dev-1.1' into dev

This commit is contained in:
suxiaoxin 2017-10-13 11:54:51 +08:00
commit 70b8a8e5d4

View File

@ -386,7 +386,7 @@ class groupController extends baseController {
if(result[i].role !== 'member'){
newResult.unshift(result[i]);
}else{
let publicCount = await projectInst.countWithPublic(result[i].id);
let publicCount = await projectInst.countWithPublic(result[i]._id);
if(publicCount > 0){
newResult.push(result[i]);
}else{