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

fix: 如果项目没有流程，无法选择移动后的状态，也没办法确定移动

Browse Source
This commit is contained in:
weifs
2024-06-03 11:13:01 +08:00
parent 79065a7675
commit 008040d96c
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2340,6 +2340,7 @@ class ProjectController extends AbstractController
$flow_item_id = intval(Request::input('flow_item_id'));
$owner = Request::input('owner', []);
$assist = Request::input('assist', []);
$completeAt = trim(Request::input('complete_at', ''));
//
$task = ProjectTask::userTask($task_id);
//
@@ -2360,9 +2361,13 @@ class ProjectController extends AbstractController
if (empty($flowItem)) {
return Base::retError('任务状态不存在');
}
} else if (!$flow_item_id && !$completeAt) {
if (projectFlowItem::whereProjectId($project->id)->count() > 0) {
return Base::retError('请选择移动后状态', [], 102);
}
}
//
$task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist);
$task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist, $completeAt);
//
$task = ProjectTask::userTask($task_id);
//