Commit 091409d4 authored by hujun's avatar hujun

1

parent 7cb5dd02
...@@ -205,18 +205,6 @@ class Finance extends Basic ...@@ -205,18 +205,6 @@ class Finance extends Basic
$agent_where['b.name'] = [ 'LIKE', '%' . $this->params['agent_name'] . '%' ]; $agent_where['b.name'] = [ 'LIKE', '%' . $this->params['agent_name'] . '%' ];
} }
if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
$agent_where['a.create_time'] = [ '> time', $this->params['create_time'] . ' 00:00:00' ];
}
if (!empty($this->params['end_time']) && empty($this->params['create_time'])) {
$agent_where['a.create_time'] = [ '< time', $this->params['end_time'] . ' 23:59:59' ];
}
if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
$agent_where['a.create_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
if (!empty($agent_where)) { if (!empty($agent_where)) {
$m_agent = new OMarchInModel(); $m_agent = new OMarchInModel();
$agent_where['c.id'] = ['>', 0]; $agent_where['c.id'] = ['>', 0];
...@@ -237,6 +225,7 @@ class Finance extends Basic ...@@ -237,6 +225,7 @@ class Finance extends Basic
} }
$where['a.id'] = [ 'in', $where_id ]; $where['a.id'] = [ 'in', $where_id ];
} }
$is_show = 1;
} }
//分佣方姓名 //分佣方姓名
...@@ -256,6 +245,7 @@ class Finance extends Basic ...@@ -256,6 +245,7 @@ class Finance extends Basic
} }
$where['a.id'] = [ 'in', $where_id ]; $where['a.id'] = [ 'in', $where_id ];
} }
$is_show = 1;
} }
$list_data = $this->m_bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where); $list_data = $this->m_bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where);
......
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