|
@@ -226,7 +226,7 @@ class Export extends Base
|
|
|
$param = $this->request->only(['start' => '', 'end' => '','create_start' => '', 'create_end' => '', 'name' => '',
|
|
|
'bank' => '', 'status' => '', 'tradNo' => '', 'company' => '', 'userd_lower' => '', 'used_upper' => '',"logNo"=>"",
|
|
|
"orderCode"=>"","cxCode"=>"","pcCode"=>"","platform_type"=>"","relaNo"=>""], 'post', 'trim');
|
|
|
- $where = [["b.is_del","=",0]];
|
|
|
+ $where = [["b.is_del","=",0],["a.is_del","=",0],["c.is_del","=",0],["d.is_del","=",0]];
|
|
|
if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['b.addtime', 'between', [$param['start'] . ' 00:00:00', $param['end'] . ' 23:59:59']];
|
|
|
if (($param['create_start'] != '') && ($param['create_end'] != '')) $where[] = ['b.addtime', 'between', [$param['create_start'] . ' 00:00:00', $param['create_end'] . ' 23:59:59']];
|
|
|
if ($param['name'] != '') $where[] = ['a.trade_out', 'like', '%' . $param['name'] . '%'];
|