oa 去掉 ->where('channel',$user['depart_top'][0]['depart_id'])

app/Service/OaService.php

@@ -47,12 +47,10 @@ class OaService extends Service
     public function fillData($data) {
         if (empty($data['data'])) return $data;
 
-        $depart = Depart::whereIn('id',array_column($data['data'],'channel'))
-            ->pluck('title','id')
-            ->toArray();
         foreach ($data['data'] as $key => $value){
-            $data['data'][$key]['top_depart_title'] = $depart[$value['channel']] ?? '';
+            $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']): '';
         }
+
         return $data;
     }
 
@@ -443,7 +441,6 @@ class OaService extends Service
             $order->menu_id = $menu_id;
             $order->order_no = $order_no;
             $order->opt_case = $type;
-            $order->channel = $this->user['depart_top'][0]['depart_id'];
             $order->save();
             $id = $order->id;
 
@@ -675,7 +672,6 @@ class OaService extends Service
             $report->order_no = $oaOrder->order_no;
             $report->opt_case = $oaOrder->opt_case;
             $report->user_id = $user_id;
-            $report->channel = $this->user['depart_top'][0]['depart_id'] ?? 0;
             $report->save();
 
             foreach ($oa_sub_report_employee as $v) {
@@ -750,20 +746,11 @@ class OaService extends Service
         $user_id = $user['id'];
         $order_no = $data['order_no'];
         $menu_id = $data['menu_id'];
-        //特殊的审批
-        $oa_id = Oa::where('menu_id',$menu_id)->where('del_time', 0)->where('sub_type',2)->exists();
-        if($oa_id){
-            $detail = OaOrder::where('order_no', $order_no)
-                ->orderBy('id', 'desc')
-                ->where('menu_id', $menu_id)
-                ->first();
-        }else{
-            $detail = OaOrder::where('order_no', $order_no)
-                ->where('channel',$this->user['depart_top'][0]['depart_id'])
-                ->orderBy('id', 'desc')
-                ->where('menu_id', $menu_id)
-                ->first();
-        }
+
+        $detail = OaOrder::where('order_no', $order_no)
+            ->orderBy('id', 'desc')
+            ->where('menu_id', $menu_id)
+            ->first();
 
         if (empty($detail))  return [true, ['state' => 0]];
         if ($detail->state == 2) return [true, ['state' => 0]];
@@ -854,7 +841,7 @@ class OaService extends Service
     public function oaSubRemark($data)
     {
         $order_no = $data['order_no'];
-        $first = OaOrder::where('del_time', 0)->where('channel',$this->user['depart_top'][0]['depart_id'])->where('order_no', $order_no)->orderBy('id', 'desc')->first();
+        $first = OaOrder::where('del_time', 0)->where('order_no', $order_no)->orderBy('id', 'desc')->first();
         if (empty($first)) return [true, []];
         $oa_order_id = $first->id;
         $remark = OaOrderSub::where('oa_order_id', $oa_order_id)->orderBy('sort', 'desc')->value('remark');
@@ -870,7 +857,6 @@ class OaService extends Service
             ->leftJoin('oa_order as oo','oo.order_no','o.order_no')
             ->leftJoin('employee as ee','ee.id','o.user_id')
             ->where('e.employee_id',$id)
-            ->where('o.channel',$this->user['depart_top'][0]['depart_id'])
             ->groupBy('oo.id')->orderBy('oo.id','desc')
             ->select('oo.*','o.id as sid','o.check','o.user_id','ee.emp_name');
         $list = $this->limit($list,'',$data);
@@ -880,7 +866,7 @@ class OaService extends Service
 
     public function reportCheck($data){
         $id = $data['sid'];
-        OaReportOrder::wherein('id',$id)->where('channel',$this->user['depart_top'][0]['depart_id'])->update([
+        OaReportOrder::wherein('id',$id)->update([
             'check' => 1
         ]);
         return [true,''];
@@ -918,7 +904,6 @@ class OaService extends Service
             $return[$value] = ['oa_state' => 0];
         }
         $detail = OaOrder::whereIn('order_no', $order_no)
-            ->where('channel',$user['depart_top'][0]['depart_id'])
             ->where('menu_id', $menu_id)
             ->where('del_time', 0)
             ->orderBy('id', 'desc')