house v2 tool fix

app/controller/house/v2/tool.js

@@ -374,6 +374,7 @@ class ToolController extends Controller {
             const city_result = await ctx.blockModel.City.one({ where: { code: city_code } });
             const area_results = await ctx.blockModel.City.all({ where: { name: { $like: `%${keyword}%` }, level: 3, parent: city_result.id } });
             const area_results_codes = R.pluck('code', area_results);
+            const area_map = R.zipObj(area_results_codes)(area_results);
 
             if (area_results_codes && area_results_codes.length > 0) {
 
@@ -384,12 +385,12 @@ class ToolController extends Controller {
                 //房价走势
                 let out_codes = R.pluck('code', price_map_results);//去重
                 const house_price_trend_results = await ctx.blockModel.HousePriceTrend2.all({ where: { id: { $in: area_results_codes, $notIn: out_codes } } });
-                const price_trend_results = house_price_trend_results.map(item => { return { name: item.name, code: item.id, description: `${month}月参考价`, price: '-----', unit: '元/平' } });
+                const price_trend_results = house_price_trend_results.map(item => { return { name: area_map[item.id]['name'] ? area_map[item.id]['name'] : keyword, code: item.id, description: `${month}月参考价`, price: '-----', unit: '元/平' } });
 
                 //房价供需趋势
                 out_codes = out_codes.concat(R.pluck('code', price_trend_results));//去重
                 const house_supply_demand_results = await ctx.blockModel.HouseSupplyDemand2.all({ where: { id: { $in: area_results_codes, $notIn: out_codes } } });
-                const supply_demand_results = house_supply_demand_results.map(item => { return { name: item.name, code: item.id, description: `${month}月参考价`, price: '-----', unit: '元/平' } });
+                const supply_demand_results = house_supply_demand_results.map(item => { return { name: area_map[item.id]['name'] ? area_map[item.id]['name'] : keyword, code: item.id, description: `${month}月参考价`, price: '-----', unit: '元/平' } });
 
                 results = [...price_map_results, ...price_trend_results, ...supply_demand_results];
             }