diff --git a/app/Http/Controllers/Api/ReportController.php b/app/Http/Controllers/Api/ReportController.php index 0e3d04588..4b3b623c3 100755 --- a/app/Http/Controllers/Api/ReportController.php +++ b/app/Http/Controllers/Api/ReportController.php @@ -316,13 +316,16 @@ class ReportController extends AbstractController // 未完成的任务 $unfinishedContent = ""; $unfinished_task = ProjectTask::query() - ->whereNull("complete_at") - ->whereNotNull("start_at") - ->where("end_at", "<", $end_time->toDateTimeString()) + ->join("projects", "projects.id", "=", "project_tasks.project_id") + ->whereNull("projects.archived_at") + ->whereNull("project_tasks.complete_at") + ->whereNotNull("project_tasks.start_at") + ->where("project_tasks.end_at", "<", $end_time->toDateTimeString()) ->whereHas("taskUser", function ($query) use ($user) { $query->where("userid", $user->userid); }) - ->orderByDesc("id") + ->select("project_tasks.*") + ->orderByDesc("project_tasks.id") ->get(); if ($unfinished_task->isNotEmpty()) { foreach ($unfinished_task as $task) { diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 4250e68f7..337cb67a2 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -649,7 +649,7 @@ export default { }, [ h('AutoTip', { props: { - placement: 'right' + placement: 'top' } }, $A.getFileName(row)) ]));