Commit d13e7a2c authored by hujun's avatar hujun

修改

parent fded8eed
...@@ -129,7 +129,8 @@ class Finance extends Basic ...@@ -129,7 +129,8 @@ class Finance extends Basic
default : default :
//成交报告列表-第一级审核 //成交报告列表-第一级审核
$order = 'a.id DESC'; $order = 'a.id DESC';
$where[]= ['EXP','e.audit_level IS NULL or e.id not in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 and `status`<>3 GROUP BY bargain_id)']; $where['e.audit_level'] = ['NULL'];
$where[]= ['EXP','e.audit_level IS NULL or e.id not in (SELECT MAX(id) FROM o_financial_audit WHERE is_del = 0 GROUP BY bargain_id)'];
} }
if (!empty($this->params['status'])) { if (!empty($this->params['status'])) {
...@@ -1137,6 +1138,7 @@ class Finance extends Basic ...@@ -1137,6 +1138,7 @@ class Finance extends Basic
$m_financial = new OFinancialAudit(); $m_financial = new OFinancialAudit();
$data['status'] = 3; $data['status'] = 3;
$data['is_del'] = 1;
$data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id'); $data = $m_financial->editData($data, $this->params['bargain_id'], 'bargain_id');
$msg = ''; $msg = '';
......
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