Commit 2b1f3101 authored by hujun's avatar hujun

修改上一步

parent 19976129
...@@ -946,7 +946,7 @@ class Finance extends Basic ...@@ -946,7 +946,7 @@ class Finance extends Basic
$where['c.is_del'] = 0; $where['c.is_del'] = 0;
$where['b.status'] = [ 'in', [10,11,13] ]; //10已提交 11审核成功 $where['b.status'] = [ 'in', [10,11,13] ]; //10已提交 11审核成功
$where['a.father_id'] = ['neq', 0];
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) { if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
$where['a.create_time'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ]; $where['a.create_time'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ];
} }
......
...@@ -189,7 +189,7 @@ class OTaxes extends BaseModel ...@@ -189,7 +189,7 @@ class OTaxes extends BaseModel
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
->join('o_order c', 'b.order_id = c.id', 'left') ->join('o_order c', 'b.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->join('a_agents e', 'b.agent_id = e.id', 'left') ->join('a_agents e', 'a.agent_id = e.id', 'left')
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
......
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