|
@@ -501,7 +501,9 @@ class OaService extends Service
|
|
if (!isset($all['order_number'])) $request->merge($param);
|
|
if (!isset($all['order_number'])) $request->merge($param);
|
|
// $request->merge($param);
|
|
// $request->merge($param);
|
|
$detail = $this->oaGetData($menu_id, $request,$user);
|
|
$detail = $this->oaGetData($menu_id, $request,$user);
|
|
- $oa_id = Oa::where('menu_id', $menu_id)->where('channel',$this->user['depart_top'][0]['depart_id'])->where('del_time', 0)->value('id');
|
|
|
|
|
|
+ //特殊的审批
|
|
|
|
+ $oa_id = Oa::where('menu_id',$menu_id)->where('del_time', 0)->where('sub_type',2)->value('id');
|
|
|
|
+ if(empty($oa_id)) $oa_id = Oa::where('menu_id', $menu_id)->where('channel',$this->user['depart_top'][0]['depart_id'])->where('del_time', 0)->value('id');
|
|
$parent_ids = [$parent_id, 0];
|
|
$parent_ids = [$parent_id, 0];
|
|
// var_dump($parent_ids);
|
|
// var_dump($parent_ids);
|
|
if ($sort > 2) {
|
|
if ($sort > 2) {
|