bug

application/admin/controller/PhOrders.php

@@ -40,6 +40,8 @@ class PhOrders extends Auth
                     ->column('p.order_id');
                 if(!empty($orderId)){
                     $map[] = ['a.id','in',$orderId];
+                }else{
+                    $map[] = ['a.id','=',0];
                 }
             }
 
@@ -103,7 +105,11 @@ class PhOrders extends Auth
                         ->where('id',$v['dep_id'])
                         ->value('title');
                 }
-                $workerId  = Db::name('ph_todo')->where('order_id',$v['id'])->whereIn('status',[1,2])->column('worker_id');
+                $workerId  =
+                    $v['status'] == 3 ?
+                    Db::name('ph_todo')->where('order_id',$v['id'])->column('worker_id')
+                    :
+                    Db::name('ph_todo')->where('order_id',$v['id'])->whereIn('status',[1,2])->column('worker_id');
                 if (!empty($workerId)) {
                     foreach ($workerId as $k2=>$v2){
                         $userId = Db::name('worker')->where('id',$v2)->value('user_id');
@@ -381,10 +387,15 @@ class PhOrders extends Auth
                     ->where('u.real_name','like','%'.$title.'%')
                     ->where('uo.org_id',$this->orgId)
                     ->column('u.id');
-                if(!empty($user)){
-                    $map[] = ['a.user_id','in',$user];
+                $orderId = Db::name('ph_todo')
+                    ->alias('p')
+                    ->join('worker w','w.id=p.worker_id')
+                    ->where('w.user_id','in',$user)
+                    ->column('p.order_id');
+                if(!empty($orderId)){
+                    $map[] = ['a.id','in',$orderId];
                 }else{
-                    $map[] = ['a.user_id','=',0];
+                    $map[] = ['a.id','=',0];
                 }
             }
 

application/admin/controller/PhStatistics.php

@@ -1,12 +1,7 @@
 <?php
 namespace app\admin\controller;
 
-use app\common\util\ExcelUtil;
-use think\App;
 use think\Db;
-use think\db\Where;
-use think\Exception;
-use function GuzzleHttp\Promise\all;
 
 class PhStatistics extends Auth
 {
@@ -306,7 +301,7 @@ class PhStatistics extends Auth
 
             //循环刚取出来的数组，将数据逐一添加到excel表格。
             for ($i = 0; $i < count($lists); $i++) {
-                $objPHPExcel->getActiveSheet()->setCellValue('A' . ($i + 2), $lists[$i]['order_sn']);
+                $objPHPExcel->getActiveSheet()->setCellValueExplicit('A' . ($i + 2), $lists[$i]['order_sn']);
                 $objPHPExcel->getActiveSheet()->setCellValue('B' . ($i + 2), $lists[$i]['depTitle']);
                 $objPHPExcel->getActiveSheet()->setCellValue('C' . ($i + 2), $lists[$i]['worker']);
                 $objPHPExcel->getActiveSheet()->setCellValue('D' . ($i + 2), $lists[$i]['cateTitle']);