model

application/index/controller/Finance.php

@@ -2791,7 +2791,7 @@ class Finance extends Basic
             if (!empty($where)) {
                 //获取被修改人信息
                 $m_agent    = new AAgents();
-                $agent_data = $m_agent->agentBargainOfficeAll('a.id,a.store_id,a.district_id,d.income_time,b.create_time', $where);
+                $agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,d.income_time,b.create_time', $where);
                 foreach ($agent_data as $k=>$v) {
                     $income_time = date('Y-m-d', strtotime($v['income_time']));
                     $create_time = date('Y-m-d', strtotime($v['create_time']));

application/model/OBargainModel.php

@@ -1644,8 +1644,8 @@ class OBargainModel extends Model
         return $this->db_->alias('a')
             ->field($field)
             ->join('a_agents b', 'a.agent_id = b.id', 'left')
-            ->join('office_o_partial_commission c', 'a.id = c.bargain_id', 'left')
-            ->join('office_o_real_income d', 'c.real_income_id = d.id', 'left')
+            ->join('o_partial_commission c', 'a.id = c.bargain_id', 'left')
+            ->join('o_real_income d', 'c.real_income_id = d.id', 'left')
             ->where($where)
             ->select();
     }