Commit 2308b25e authored by Hsinli's avatar Hsinli

fix the lsit

parent d15544b1
Pipeline #6417 passed with stage
in 7 seconds
...@@ -24,12 +24,12 @@ class NewHouseController extends Controller { ...@@ -24,12 +24,12 @@ class NewHouseController extends Controller {
}; };
ctx.validate(rule, inputParams); ctx.validate(rule, inputParams);
let ret = {}; let ret = {};
if (inputParams.hasOwnProperty('type') && inputParams.type !== '') { // if (inputParams.hasOwnProperty('type') && inputParams.type !== '') {
ret = await ctx.service.house.newHouse.getNewHouseListByType(inputParams); // ret = await ctx.service.house.newHouse.getNewHouseListByType(inputParams);
} else { // } else {
ret = await ctx.service.house.newHouse.getNewHouseList(inputParams); // ret = await ctx.service.house.newHouse.getNewHouseList(inputParams);
} // }
// ret = await ctx.service.house.newHouse.getNewHouseListV2(inputParams); ret = await ctx.service.house.newHouse.getNewHouseListV2(inputParams);
ctx.success(ret); ctx.success(ret);
} }
......
...@@ -482,6 +482,8 @@ class NewHouseService extends Service { ...@@ -482,6 +482,8 @@ class NewHouseService extends Service {
async getNewHouseListV2(condition) { async getNewHouseListV2(condition) {
const { ctx, service } = this; const { ctx, service } = this;
let types = ['all', 'sale', 'open', 'favourable', 'home'];
let type = (condition.hasOwnProperty('type') && types.includes(condition.type)) ? condition.type : '';
let page = Number(condition.page) || 1; let page = Number(condition.page) || 1;
let pageSize = Number(condition.page_size) || 30; let pageSize = Number(condition.page_size) || 30;
let filter = { let filter = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment