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

app/model/realestate/new_house_city_price.js

@@ -23,7 +23,7 @@ module.exports = app => {
             type: INTEGER,
             allowNull: true
         },
-        state: {
+        valid: {
             type: INTEGER,
             allowNull: true
         },

app/service/house/v2/new_house.js

@@ -541,16 +541,14 @@ class NewHouseService extends Service {
         const { ctx } = this;
         //所有支持的城市编码
         let filter = {
+            attributes: ['city', 'code', 'price'],
             where: {
                 valid: 1
             }
         }
-        let cityPrice = await ctx.realestateModel.NewHouseCityPrice.findAll(filter);
-        let ret = {};
-        if (cityPrice !== undefined && cityPrice.length > 0) {
-            for (let i in cityPrice) {
-                ret[cityPrice[i].code] = cityPrice[i];
-            }
+        let ret = await ctx.realestateModel.NewHouseCityPrice.findAll(filter);
+        if (ret === undefined && ret.length === 0) {
+            return [];
         }
         return ret;
     }