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

application/api/controller/FindShop.php

@@ -164,10 +164,10 @@ class FindShop extends Basic
             $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']));
         }
-        if (isset($params['industry_type'])) { //业态
+        if (isset($params['industry_type']) && $params['industry_type'] != "全部") { //业态
             $conditions['industry_type'] = array('like', "%" . trim($params['industry_type']) . "%");
         }
 

application/index/controller/FindShop.php

@@ -50,7 +50,7 @@ class FindShop extends Basic
         }
         if (isset($params['submit_time_start']) && isset($params['submit_time_end'])) {
             $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));
         }
         if (isset($params['user_id'])) {