Merge branch 'hotfix/question2.1' into gray

@@ -11,7 +11,7 @@ const suggestFeedBackModel = require('../models/suggestFeedBack-service');
 
 
 const getFeedBack = (req, res, next) => {
 const getFeedBack = (req, res, next) => {
 
 
-    suggestFeedBackModel.suggestFeedBack().then((result) => {
+    suggestFeedBackModel.suggestFeedBack(req.user.uid).then((result) => {
         res.jsonp(result);
         res.jsonp(result);
     }).catch(next);
     }).catch(next);
 };
 };

@@ -14,9 +14,9 @@ const URL_ACTIVITY_QUESTION = '/activity/question/';
  * @param uid
  * @param uid
  * @return string
  * @return string
  */
  */
-const feedBackApi = () => {
+const feedBackApi = (uid) => {
 
 
-    return service.get(URL_ACTIVITY_QUESTION + 'questionList', {});
+    return service.get(URL_ACTIVITY_QUESTION + 'questionList', {uid: uid});
 };
 };
 
 
 module.exports = {
 module.exports = {

@@ -9,9 +9,9 @@ const api = require('./suggestFeedBack-api');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const _ = require('lodash');
 const _ = require('lodash');
 
 
-const suggestFeedBack = () => {
+const suggestFeedBack = (uid) => {
 
 
-    return api.feedBackApi().then((result) => {
+    return api.feedBackApi(uid).then((result) => {
         let suggestData = [];
         let suggestData = [];
 
 
         if (result && result.code === 200 && _.get(result, 'data.rows')) {
         if (result && result.code === 200 && _.get(result, 'data.rows')) {