This commit is contained in:
mkm 2024-01-13 10:11:13 +08:00
parent 1c80c028ad
commit ad353e17a9

View File

@ -74,19 +74,20 @@ class TaskStages extends CommonModel
$member=new MemberAccount(); $member=new MemberAccount();
$member_code=getCurrentMember()['code']; $member_code=getCurrentMember()['code'];
$find=$member->where('member_code',$member_code)->find(); $find=$member->where('member_code',$member_code)->find();
if($find &&$find['is_liaison_man']==0){ if(isset($data['type']) &&$data['type']=='copied_list'){
$joinTaskMember = true; $taskModel = $taskModel->whereRaw('find_in_set(t.copied_list ,:id) ', ['id' => $member_code]);
$type=ProjectAuth::where('id',$find['authorize'])->value('type'); }else{
if($type=='admin'){ if($find &&$find['is_liaison_man']==0){
$taskModel = $taskModel->where('t.create_by',$member_code); $joinTaskMember = true;
}else{ $type=ProjectAuth::where('id',$find['authorize'])->value('type');
if(isset($data['type']) &&$data['type']=='copied_list'){ if($type=='admin'){
$taskModel = $taskModel->whereRaw('find_in_set(t.copied_list ,:id) ', ['id' => $member_code]); $taskModel = $taskModel->where('t.create_by',$member_code);
}else{ }else{
$taskModel = $taskModel->leftJoin('task_member tm', 't.code = tm.task_code')->where('tm.member_code', $member_code)->where('tm.is_executor', 1); $taskModel = $taskModel->leftJoin('task_member tm', 't.code = tm.task_code')->where('tm.member_code', $member_code)->where('tm.is_executor', 1);
} }
} }
} }
// if ($executor) { // if ($executor) {
// } // }