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: add group bug

Browse Source
This commit is contained in:
苏文雄 2019-08-23 17:24:33 +08:00
parent d57577dbb3
commit 7f56e3999a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/containers/Group/GroupList/GroupList.js
View File

@ -130,11 +130,6 @@ export default class GroupList extends Component {
});
await this.props.fetchGroupList();
this.setState({ groupList: this.props.groupList });
const id = res.data.data._id;
const currGroup = _.find(this.props.groupList, group => {
return +group._id === +id;
});
this.props.setCurrGroup(currGroup);
this.props.fetchGroupMsg(this.props.currGroup._id);
this.props.fetchNewsData(this.props.currGroup._id, 'group', 1, 10);
} else {

13
server/controllers/group.js
View File

@ -424,17 +424,22 @@ class groupController extends baseController {
}
const groupIds = newResult.map(item=> item._id);
const newGroupIds = [];
let groupByProject = await projectInst.getAuthList(this.getUid());
if(groupByProject && groupByProject.length > 0){
groupByProject.forEach( _data=>{
if(!_.find(groupIds, id=> id === _data.group_id)){
groupIds.push(_data.group_id)
const _temp = [...groupIds, ...newGroupIds];
if(!_.find(_temp, id=> id === _data.group_id)){
newGroupIds.push(_data.group_id)
}
})
}
newResult = await groupInst.findByGroups(groupIds)
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++) {

2
server/models/group.js
View File

@ -155,7 +155,7 @@ class groupModel extends baseModel {
'type': 'public',
uid
}]
}).select(' _id group_desc add_time up_time type uid custom_field1')
}).select(' _id group_name group_desc add_time up_time type uid custom_field1')
.exec();
}