业绩明细bug

application/index/controller/PerformanceInfo.php

@@ -55,7 +55,8 @@ class PerformanceInfo extends Basic
             }
             // 商铺编号
             if ($this->params['house_id'] != NULL) {
-                $where['Houses.id'] = $this->params['house_id'];
+                $where['Oorder.house_id'] = $this->params['house_id'];
+
             }
 
             // 部门
@@ -85,7 +86,7 @@ class PerformanceInfo extends Basic
             if ($this->params['bargain_id'] != NULL) {
                 $where['Obargain.id'] = $this->params['bargain_id'];
             }
-
+            //dump($where);
             $field  = 'Obargain.create_time,';
             $field .= 'Obargain.id,';
             $field .= 'Obargain.father_id,';
@@ -152,7 +153,7 @@ class PerformanceInfo extends Basic
         }
         // 商铺编号
         if ($this->params['house_id'] != NULL) {
-            $where['Houses.id'] = $this->params['house_id'];
+            $where['Oorder.house_id'] = $this->params['house_id'];
         }
 
         // 部门

application/model/OBargainModel.php

@@ -1411,7 +1411,7 @@ class OBargainModel extends Model
             ->limit($pageSize)
             ->page($pageNo)
             ->select();
-        // echo $this->db_->getLastSql();
+         //echo $this->db_->getLastSql();
         return $result;
     }
 
@@ -1451,6 +1451,8 @@ class OBargainModel extends Model
             ->join("a_agents Agent", "Obargain.agent_id    = Agent.id", "left")
             ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
             ->join('a_district District', 'Agent.district_id = District.id', 'left')
+            ->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
+
             ->where($where)
             ->count();
         // echo $this->db_->getLastSql();