diff --git a/application/common/Model/TaskStages.php b/application/common/Model/TaskStages.php index 72f26a8..772ff00 100755 --- a/application/common/Model/TaskStages.php +++ b/application/common/Model/TaskStages.php @@ -5,6 +5,7 @@ namespace app\common\Model; use service\FileService; use service\RandomService; use service\ToolsService; +use think\Db; use think\File; /** @@ -70,10 +71,16 @@ class TaskStages extends CommonModel } //todo 查询范围问题 $joinTaskMember = false; - if ($executor) { + $member=new MemberAccount(); + $member_code=getCurrentMember()['code']; + $find=$member->where('member_code',$member_code)->find(); + if($find &&$find['is_liaison_man']==0){ $joinTaskMember = true; - $taskModel = $taskModel->leftJoin('task_member tm', 't.code = tm.task_code')->whereIn('tm.member_code', $executor)->where('tm.is_executor', 1); + $taskModel = $taskModel->leftJoin('task_member tm', 't.code = tm.task_code')->whereIn('tm.member_code', $member_code)->where('tm.is_executor', 1); } + // if ($executor) { + + // } if ($creator) { !$joinTaskMember && $taskModel->leftJoin('task_member tm', 't.code = tm.task_code'); $taskModel = $taskModel->whereIn('tm.member_code', $creator)->where('tm.is_owner', 1);