addd

app/controller/house/v2/tool.js

@@ -398,12 +398,41 @@ class ToolController extends Controller {
         let ret = [];
         if (cityCode !== undefined && cityCode.length > 0) {
             let cityCodes = _.uniq(_.map(cityCode, 'id'));
-            let cityFilter = {
-                attributes: ['name', 'code'],
-                where: { code: { $in: cityCodes } }
+            // let cityFilter = {
+            //     attributes: ['name', 'code'],
+            //     where: { code: { $in: cityCodes } }
+            // }
+            // let cityName = await ctx.blockModel.City.findAll(cityFilter);
+            // ret = cityName !== undefined ? cityName : [];
+
+            const city_list_ret = await ctx.blockModel.City.all({ where: { code: { $in: cityCodes } } });
+            const city_list = [];
+            for (let i in city_list_ret) {
+                let city = city_list_ret[i];
+                if (city.name.indexOf('市辖区') !== -1) {
+                    city = await ctx.blockModel.City.one({ where: { id: city.parent } });
+                    if (!city || !city.id) {
+                        continue;
+                    }
+                }
+    
+                city_list.push({
+                    id: city.id,
+                    name: city.name,
+                    code: city.code,
+                    letter: city.fword.toUpperCase(),
+                });
+            }
+            const cities_ids = R.pluck('code', city_list);
+            const districts = await ctx.blockModel.HouseDistrict.all({ where: { city_id: { $in: cities_ids } } });
+            const ret = [];
+            for (let i in city_list) {
+                const city = city_list[i];
+                const children = districts.filter(item => { return (parseInt(item.city_id) === parseInt(city.code)) ? true : false });
+                city._children = children.map(item => { return { id: item.id, name: item.name, code: item.id } });
+                // city._children.unshift({ id: -1, name: '全部', code: 0 });
+                ret.push(city);
             }
-            let cityName = await ctx.blockModel.City.findAll(cityFilter);
-            ret = cityName !== undefined ? cityName : [];
         }
         ctx.success(ret);
     }