Merge branch 'dev' of http://120.46.155.214:3000/wugg/cxinv into dev

app/admin/controller/Export.php

@@ -84,7 +84,7 @@ class Export extends BaseController
         $list = Db::name('pay_invoice')
             ->alias('a')
             ->leftJoin('pay b', 'a.payNo=b.payNo')
-            ->leftJoin('invoice_info c', 'c.hpNo=a.hpNo')
+            ->leftJoin('invoice_info c', 'c.hpNo=a.hpNo AND c.status=1')
             ->field('"" 序号,a.hpNo,a.addtime,a.invoiceNumber,a.open_time,b.supplierName,a.invoiceType,a.status,a.updatetime,a.remark,c.item_list,c.total')
             ->where($where)
             ->order('a.addtime desc')