This commit is contained in:
mkm 2024-01-09 11:59:56 +08:00
parent ece1f6540c
commit 95deb26187

View File

@ -5,6 +5,7 @@ namespace app\common\Model;
use service\FileService; use service\FileService;
use service\RandomService; use service\RandomService;
use service\ToolsService; use service\ToolsService;
use think\Db;
use think\File; use think\File;
/** /**
@ -70,10 +71,16 @@ class TaskStages extends CommonModel
} }
//todo 查询范围问题 //todo 查询范围问题
$joinTaskMember = false; $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; $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) { if ($creator) {
!$joinTaskMember && $taskModel->leftJoin('task_member tm', 't.code = tm.task_code'); !$joinTaskMember && $taskModel->leftJoin('task_member tm', 't.code = tm.task_code');
$taskModel = $taskModel->whereIn('tm.member_code', $creator)->where('tm.is_owner', 1); $taskModel = $taskModel->whereIn('tm.member_code', $creator)->where('tm.is_owner', 1);