From 7f56e3999aa423686b7108ad47b95dc64e435ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E6=96=87=E9=9B=84?= <suwenxiong@meituan.com>
Date: Fri, 23 Aug 2019 17:24:33 +0800
Subject: [PATCH] fix: add group bug

---
 client/containers/Group/GroupList/GroupList.js |  5 -----
 server/controllers/group.js                    | 13 +++++++++----
 server/models/group.js                         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/containers/Group/GroupList/GroupList.js b/client/containers/Group/GroupList/GroupList.js
index bd04180b..a0f646d0 100755
--- a/client/containers/Group/GroupList/GroupList.js
+++ b/client/containers/Group/GroupList/GroupList.js
@@ -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 {
diff --git a/server/controllers/group.js b/server/controllers/group.js
index 226837d2..04ce565f 100755
--- a/server/controllers/group.js
+++ b/server/controllers/group.js
@@ -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++) {
diff --git a/server/models/group.js b/server/models/group.js
index 9411d300..386d27ef 100755
--- a/server/models/group.js
+++ b/server/models/group.js
@@ -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();
     
   }