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

app/service/house/option.js

@@ -135,7 +135,7 @@ class OptionService extends Service {
         }
         const districts = await ctx.blockModel.HouseDistrict.all({ where: { city_id: city.code } });
         if (!districts || districts.length === 0) {
-            ctx.failed('district error');
+            return [];
         }
 
         const ret = []

app/service/house/rental_house.js

@@ -22,8 +22,8 @@ class RentalHouseService extends Service {
         const queryConditions = [];
         if (condition.brand) {
             queryConditions.push({
-                key: 'developerId',
-                value: condition.brand,
+                key: 'developerid',
+                value: parseInt(condition.brand),
                 operator: 'equal',
             });
         }
@@ -41,15 +41,15 @@ class RentalHouseService extends Service {
         }
         if (condition.house_type) {
             queryConditions.push({
-                key: 'rentalHouseType',
-                value: condition.house_type,
-                operator: 'contains',
+                key: 'type',
+                value: parseInt(condition.house_type),
+                operator: 'equal',
             });
         }
-        if (condition.area_name) {
+        if (condition.area_code) {
             queryConditions.push({
-                key: 'area_name',
-                value: condition.area_name,
+                key: 'county',
+                value: condition.area_code,
                 operator: 'equal',
             });
         }