Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/SaleReport.php

@@ -193,6 +193,10 @@ class SaleReport extends Base
 
         $count = Db::name('consult_info')
             ->alias('ci')
+            ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
+            ->leftJoin('unit u', 'u.id=ci.unit')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
+            ->leftJoin('consult_bids cb', 'cb.infoNo=ci.infoNo')
             ->where($where)
             ->order('ci.addtime', 'desc')
             ->count('ci.id');
@@ -281,6 +285,7 @@ class SaleReport extends Base
 
         $count = Db::name('sale')
             ->alias('s')
+            ->leftJoin('customer_info csi', 'csi.companyNo=s.customer_code')
             ->where($where)
             ->count('s.id');