1

application/model/OBargainModel.php

@@ -358,7 +358,7 @@ class OBargainModel extends Model
     public function getBargainList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
     {
         return $this->db_->field($field)->alias('a')
-//            ->join('o_report b', 'a.report_id = b.id', 'left')
+            ->join('o_report b', 'a.report_id = b.id', 'left')
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
@@ -395,11 +395,12 @@ class OBargainModel extends Model
     public function getBargainTotal(array $params = [])
     {
         return $this->db_->alias('a')
+            ->join('o_report b', 'a.report_id = b.id', 'left')
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
             ->where($params)
-//            ->group('a.id')
+            ->group('a.id')
             ->count();
     }