Commit c693fb99 authored by zhuwei's avatar zhuwei

、、

parent b7446e85
...@@ -986,6 +986,7 @@ class Finance extends Basic ...@@ -986,6 +986,7 @@ class Finance extends Basic
} }
} }
$fields = 'a.create_time,a.id,a.order_id,a.pay_log_id,a.refund_money,a.type,a.agent_id,a.agent_name,b.house_id,a.status,'; $fields = 'a.create_time,a.id,a.order_id,a.pay_log_id,a.refund_money,a.type,a.agent_id,a.agent_name,b.house_id,a.status,';
$fields .= 'd.income_time,a.type,c.store_id'; $fields .= 'd.income_time,a.type,c.store_id';
$list = $refund->getCheckRefundList($pageNo, $pageSize, 'a.id DESC', $fields, $where); $list = $refund->getCheckRefundList($pageNo, $pageSize, 'a.id DESC', $fields, $where);
...@@ -1110,7 +1111,7 @@ class Finance extends Basic ...@@ -1110,7 +1111,7 @@ class Finance extends Basic
$where['a.pay_log_id'] = $this->params['pay_log_id']; $where['a.pay_log_id'] = $this->params['pay_log_id'];
} }
if (isset($this->params['is_self']) && $this->params['is_self'] != -1) { if (is_numeric($this->params['is_self']) && $this->params['is_self'] != -1) {
if ($this->params['is_self']) { if ($this->params['is_self']) {
$where['e.operation_id'] = $this->userId; $where['e.operation_id'] = $this->userId;
} else { } else {
...@@ -1184,7 +1185,7 @@ class Finance extends Basic ...@@ -1184,7 +1185,7 @@ class Finance extends Basic
$total_money = $refund->getSumMoney($where); $total_money = $refund->getSumMoney($where);
if(!$list){ if(!$excel_data){
return '<script>alert("导出失败");window.close();</script>'; return '<script>alert("导出失败");window.close();</script>';
} }
$export = new ExportExcelUntil(); $export = new ExportExcelUntil();
......
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