1

application/index/controller/Report.php

@@ -81,6 +81,25 @@ class Report extends Basic
             $where['b.id'] = $this->params['order_id'];
         }
 
+        //城市
+        if (!empty($this->params['city'])) {
+            $where['c.city'] = $this->params['city'];
+        }
+
+        //商铺地址
+        if (!empty($this->params['internal_address'])) {
+            $where['c.internal_address'] = ['like', '%' . $this->params['internal_address'] . '%'];
+        }
+
+        //商铺ID
+        if (!empty($this->params['house_id'])) {
+            $where['c.house_id'] = $this->params['house_id'] ;
+        }
+
+        //客户ID
+        if (!empty($this->params['user_id'])) {
+            $where['a.user_id'] = $this->params['user_id'] ;
+        }
         $field = 'b.id as order_id,a.user_name,a.user_phone,a.create_time,a.report_agent_name,c.internal_title as house_title,a.predict_see_time';
         $field .= ',a.id,b.order_no';
 

application/model/OReportModel.php

@@ -307,7 +307,7 @@ class OReportModel extends Model
 
         //商铺ID
         if (!empty($params['house_id'])) {
-            $conditions[] = "aaa.user_id = {$params['house_id']}" ;
+            $conditions[] = "aaa.house_id = {$params['house_id']}" ;
         }
 
         //客户ID
@@ -763,7 +763,7 @@ class OReportModel extends Model
     }
 
     /**
-     * @param int $pageNo
+     * @param int $pageNo 7151
      * @param int $pageSize
      * @param string $order_
      * @param string $field