|
@@ -783,7 +783,21 @@ class OaService extends Service
|
|
|
$user_id = $user['id'];
|
|
|
$order_no = $data['order_no'];
|
|
|
$menu_id = $data['menu_id'];
|
|
|
- $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();
|
|
|
+ //特殊的审批
|
|
|
+ $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();
|
|
|
+ }
|
|
|
+
|
|
|
if (empty($detail)) return [true, ['state' => 0]];
|
|
|
if ($detail->state == 2) return [true, ['state' => 0]];
|
|
|
$oa_detail = OaOrderSubEmployee::where('employee_id', $user_id)->where('oa_order_id', $detail->id)->pluck('oa_order_sub_id')->toArray();
|