Merge branch 'feature/add_item' of wmtx/platform into release

优化上游
master
陈志 4 years ago committed by Gogs
commit 24bbce9d66

@ -886,9 +886,9 @@ class CompanyStatementController extends ThinkController
//整合数据
if ($k!='complement_down' && $k != 'complement_user') {
$lsres = $LackStatement->where("company_id={$company_info['id']} and is_pool = 0 and company_type = {$company_info['company_type']}")->select();
$lsres = $LackStatement->where("company_id={$company_info['id']} and is_pool = 0 and company_type = {$v['company_type']}")->select();
} else {
$lsres = $LackStatement->where("company_id={$company_info['id']} and is_pool = 0 and withdraw_type = 3 and company_type = {$company_info['company_type']}")->select();
$lsres = $LackStatement->where("company_id={$company_info['id']} and is_pool = 0 and withdraw_type = 3 and company_type = {$v['company_type']}")->select();
}
$del_lack_ids = [];

Loading…
Cancel
Save