Skip to content

T
tl_estate
Commit 84f65076 authored by hujun's avatar hujun
Browse files
Options

is_del

parent 0fa607a9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/index/controller/Finance.php
View file @ 84f65076
...@@ -2618,10 +2618,10 @@ class Finance extends Basic ...@@ -2618,10 +2618,10 @@ class Finance extends Basic
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {
$list[$k]['source_id'] = $list[$k]['is_adjustment'] = ''; $list[$k]['source_id'] = $list[$k]['is_adjustment'] = '';
if ($v['source'] == 2) { if ($v['source'] == 2) {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id']]); $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id'],'is_del'=>0]);
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id); $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
} else { } else {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]); $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id'],'is_del'=>0]);
$list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id); $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
$list[$k]['is_adjustment'] = $source_id ? 1 : 0; $list[$k]['is_adjustment'] = $source_id ? 1 : 0;
} }
......
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