Merge branch 'SANDBOX'

app/controllers/admin/forumThread.js

@@ -1097,10 +1097,10 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
                         var praiseCount = comment.praiseCount || 0;
                         var praiseNames = '';
                         if(comment.praiseNames){
-                            praiseNames = comment.praiseNames.toString();
+                            praiseNames = comment.praiseNames.toString() || '游客';
                         }
 
-                        var this_row = [floor + '', time, nickName, content, praiseCount, praiseNames];
+                        var this_row = [floor + '', time,openId, nickName, content, praiseCount, praiseNames];
                         rows.push(this_row);
 
                         if(comment.comments.length > 0){
@@ -1112,7 +1112,7 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
                                 var nickName = sub_comment.from.nickName || '游客';
                                 var content = sub_comment.content || '';
 
-                                var this_row = ['子评论', time, nickName, content, null, null];
+                                var this_row = ['回复', time,openId, nickName, content, null, null];
                                 rows.push(this_row);
                             };
                         }