Merge branch 'training-m' into transfer-master

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -407,13 +407,15 @@ 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']) && $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');
-            // 该工单是团队负责人在查看(不能直接判断是否为同一个团队，因为队员不能查看负责人的工单)
-            $team_member_ids = MasterWorker::where('team_id',$params['user_info']['team_id'])->where('team_role',2)->column('id');
-            if($lead_master_worker_id == $result['master_worker_id'] || in_array($result['master_worker_id'],$team_member_ids)){
+            // 团队负责人编辑 工单池(包括已派队员) 工单
+            if($params['user_info']['team_role'] == 1 && $params['user_info']['tenant_id'] == $result['tenant_id'] ){
+                $result['is_operate_prohibit'] = 0;
+            }elseif(!empty($lead_master_worker_id) && !empty($result['master_worker_id']) && $lead_master_worker_id == $result['master_worker_id']){
+                // 徒查看师父的工单 不能编辑可查看
                 $result['is_operate_prohibit'] = 1;
             }else{
                 throw new \Exception('您没有权限操作该工单');

app/common/cache/MasterWokerTokenCache.php

@@ -83,6 +83,7 @@ class MasterWokerTokenCache extends BaseCache
             'sn' => $user->sn,
             'mobile' => $user->mobile,
             'avatar' => $user->avatar,
+            'tenant_id' => $user->tenant_id,
             'team_id' => $user->team_id,
             'team_role' => $user->team_role,
             'terminal' => $userSession->terminal,