Skip to content

T
tl_estate
Commit 1117fc55 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/0416-v3.2.5' into 0416-v3.2.5

parents c51bd518 19e6ae98
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
application/api/controller/FindShop.php
View file @ 1117fc55
...@@ -164,10 +164,10 @@ class FindShop extends Basic ...@@ -164,10 +164,10 @@ class FindShop extends Basic
$conditions['disc'] = array('eq', trim($params['disc'])); $conditions['disc'] = array('eq', trim($params['disc']));
} }
if (isset($params['business_id'])) { //商圈 if (isset($params['business_id']) && $params['business_id'] > 0) { //商圈
$conditions['business_district_id'] = array('eq', trim($params['business_id'])); $conditions['business_district_id'] = array('eq', trim($params['business_id']));
} }
if (isset($params['industry_type'])) { //业态 if (isset($params['industry_type']) && $params['industry_type'] != "全部") { //业态
$conditions['industry_type'] = array('like', "%" . trim($params['industry_type']) . "%"); $conditions['industry_type'] = array('like', "%" . trim($params['industry_type']) . "%");
} }
......
application/index/controller/FindShop.php
View file @ 1117fc55
...@@ -50,7 +50,7 @@ class FindShop extends Basic ...@@ -50,7 +50,7 @@ class FindShop extends Basic
} }
if (isset($params['submit_time_start']) && isset($params['submit_time_end'])) { if (isset($params['submit_time_start']) && isset($params['submit_time_end'])) {
$submit_time_start = $params['submit_time_start']; $submit_time_start = $params['submit_time_start'];
$submit_time_end = $params['submit_time_end']; $submit_time_end = $params['submit_time_end'] ." 23:59:59";
$conditions['a.create_time'] = array('between', array($submit_time_start, $submit_time_end)); $conditions['a.create_time'] = array('between', array($submit_time_start, $submit_time_end));
} }
if (isset($params['user_id'])) { if (isset($params['user_id'])) {
......
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