1

app/Service/OaService.php

@@ -23,6 +23,7 @@ use App\Model\RollFilmCombine;
 use App\Model\RollFilmCompany;
 use App\Model\SysMenu;
 use App\Model\Team;
+use App\Service\Weixin\WxSendMessageService;
 use App\Service\Wx\WxService;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
@@ -495,8 +496,7 @@ class OaService extends Service
         }
         $list = OaSub::where('oa_id', $oa_id)->where('del_time', 0)->where('sort', $sort)->wherein('parent_id', $parent_ids);
         $list = $list->select('*')->get()->toArray();
-//        dd($list);
-        if (empty($list)) return [[], ''];
+        if (empty($list)) return [[], '',$detail];
         $oa_sub_ids = [];
         $oa_sub_key = [];
         foreach ($list as $v) {
@@ -504,6 +504,7 @@ class OaService extends Service
             $oa_sub_key[$v['id']] = $v;
             $rule_key_list[$v['id']] = [];
         }
+
         $rule_list = OaSubRule::wherein('oa_sub_id', $oa_sub_ids)->select('*')->get()->toArray();
 
         foreach ($rule_list as $v) {
@@ -513,6 +514,7 @@ class OaService extends Service
         //规则开始判断
         $employee_ids = [];
         $oa_sub_id = 0;
+
         foreach ($rule_key_list as $k => $v) {
 
             $status = $this->formulaRule($v, $detail);
@@ -716,17 +718,12 @@ class OaService extends Service
 
         $api = SysMenu::where('id', $menu_id)->value('api');
         $param =  SysMenu::where('id', $menu_id)->value('api_params');
-        if(!empty($param)){
-            $param =  json_decode($param,true);
-            $param['state'] = null;
-            $param['menu_id'] = $menu_id;
-            $param['id'] = null;
-            $request->userData = $user;
-            $request->merge($param);
-//            foreach ($param as $k=>$v){
-//                $request->set($k,$v);
-//            }
-        }
+        $param =  json_decode($param,true);
+        $param['state'] = null;
+        $param['menu_id'] = $menu_id;
+        $param['id'] = null;
+        $request->merge($param);
+
         $path = $this->getMenu();
         $control = '\\' . $path[$api]["controller"];
         $act = $path[$api]["act"];
@@ -925,7 +922,7 @@ class OaService extends Service
     }
 
     public function sendWxMsg($user_id,$type,$state,$menu_id,$order_data){
-        $service = new WxService();
+        $service = new WxSendMessageService();
         $service->wx_sendMsg($user_id,$type,$state,$menu_id,$order_data);
     }
 }