diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index cb9ebc4a..35217090 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -498,7 +498,8 @@ class ProjectController extends AbstractController } // $list = $builder - ->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id') + ->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_pid') + ->where('project_tasks.parent_id', 0) ->where('project_task_users.userid', $user->userid) ->orderByDesc('project_tasks.id') ->paginate(Base::getPaginate(200, 100)); diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index ee177cc8..055e75a0 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -679,6 +679,7 @@ export default { state.projectOpenTask.sub_task.push(task); } } + dispatch("saveTask", task); dispatch("getTaskOne", task.parent_id); resolve(result) }).catch(result => {