Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/Payment.php

@@ -1789,8 +1789,8 @@ class Payment extends BaseController
 //		if($companyNo =="") return error_show(1004,'业务公司编号不能为空');
         $payArr = Db::name("pay_invoice")
             ->alias("a")
-            ->leftJoin("pay b", "a.payNo=b.payNo and b.is_del=0 and b.status=2")
-            ->where(['b.is_del' => 0])
+            ->leftJoin("pay b", "a.payNo=b.payNo")
+            ->where(['a.is_del' => 0, 'b.is_del' => 0])
             ->whereIn('a.hpNo', array_column($post['list'], 'hpNo'))
             ->column("a.id,a.payNo,a.hpNo,a.invoiceType,a.inv_fee as invoice_fee,a.status,b.inv_status,b.inv_fee,b.companyNo,b.ainv_fee,b.winv_fee,a.hpNo");