Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/service/house/v2/search_history.js

@@ -45,21 +45,26 @@ class searchHistoryService extends Service {
         let endDate = moment().subtract(6, 'months').format('YYYY-MM-DD HH:mm:ss');
         let filter = {
             limit: 50,
-            attributes: [[sequelize.literal('distinct `key_word`'), 'key_word']],
+            attributes: ['key_word'],
             where: {
                 state: 1,
                 user_id: ctx.userId,
                 created_at: { $gt: endDate }
-            }
+            },
+            order: [['created_at', 'desc']],
         }
         if (type) {
             filter.where.house_style = type;
         }
         let searchHistoryList = await ctx.realestateModel.SearchHistory.findAll(filter);
-        let list = searchHistoryList.map(v => { return v.key_word });
-
-        ctx.logger.info(list);
-
+        let list = [];
+        if (searchHistoryList.length > 0) {
+            for (let i in searchHistoryList) {
+                if (list.indexOf(searchHistoryList[i].key_word) === -1) {
+                    list.push(searchHistoryList[i].key_word);
+                }
+            }
+        }
         ret = {
             results: list,
             count: list.length