Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复项目成员无法认领任务的情况

Browse Source
This commit is contained in:
kuaifan
2025-07-07 20:34:24 +08:00
parent 44baa743c0
commit b4101f856a
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Api/ProjectController.php
View File

@@ -2120,14 +2120,17 @@ class ProjectController extends AbstractController
//
$task = ProjectTask::userTask($task_id);
//
$project = Project::userProject($task->project_id);
$permissionKey = ProjectPermission::TASK_UPDATE;
if (Arr::exists($param, 'times')) {
$permissionKey = ProjectPermission::TASK_TIME;
} else if (Arr::exists($param, 'flow_item_id')) {
$permissionKey = ProjectPermission::TASK_STATUS;
if ($task->hasOwner()) {
// 已经存在负责人，则需要检查权限（即：没有任务负责人时，不检查权限）
$project = Project::userProject($task->project_id);
$permissionKey = ProjectPermission::TASK_UPDATE;
if (Arr::exists($param, 'times')) {
$permissionKey = ProjectPermission::TASK_TIME;
} else if (Arr::exists($param, 'flow_item_id')) {
$permissionKey = ProjectPermission::TASK_STATUS;
}
ProjectPermission::userTaskPermission($project, $permissionKey, $task);
}
ProjectPermission::userTaskPermission($project, $permissionKey, $task);
//
$taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($task_id)->get();
$owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();