Commit 9c8cc4e2 authored by zhuwei's avatar zhuwei

1

parent 54522d0c
...@@ -1401,7 +1401,7 @@ class OfficeOBargainModel extends Model ...@@ -1401,7 +1401,7 @@ class OfficeOBargainModel extends Model
//->join('a_store Store', 'Agent.store_id = Store.id', 'left') //->join('a_store Store', 'Agent.store_id = Store.id', 'left')
//->join('a_district District', 'Agent.district_id = District.id', 'left') //->join('a_district District', 'Agent.district_id = District.id', 'left')
->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left') ->join('office_o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
->where($where) ->where($where)
->order("Obargain.create_time desc") ->order("Obargain.create_time desc")
->limit($pageSize) ->limit($pageSize)
...@@ -1466,7 +1466,7 @@ class OfficeOBargainModel extends Model ...@@ -1466,7 +1466,7 @@ class OfficeOBargainModel extends Model
->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left") ->join("a_agents Agent", "Obargain.agent_id = Agent.id", "left")
// ->join('a_store Store', 'Agent.store_id = Store.id', 'left') // ->join('a_store Store', 'Agent.store_id = Store.id', 'left')
// ->join('a_district District', 'Agent.district_id = District.id', 'left') // ->join('a_district District', 'Agent.district_id = District.id', 'left')
->join('o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left') ->join('office_o_partial_commission PartialCommission', 'PartialCommission.bargain_id = Obargain.id', 'left')
->where($where) ->where($where)
->count(); ->count();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment