Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into zaxiang_m

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -570,7 +570,7 @@ class ServiceWorkLogic extends BaseLogic
             ->where($work_where)
             ->findOrEmpty()->toArray();
         $result['is_operate_prohibit'] = 0;
-        if(isset($params['user_id']) && $params['user_id'] && ($params['user_id'] != $result['master_worker_id']) ){
+        if(isset($params['user_id']) && $result['master_worker_id'] && $params['user_id'] && ($params['user_id'] != $result['master_worker_id']) ){
             // 带徒师傅的工单
             $lead_master_worker_id = TrainingWorkerTask::where('master_worker_id',$params['user_id'])->where('training_status',2)
                 ->where('operate_status',0)->value('lead_master_worker_id');