From 2c08145c403ca582e458dac440727cf66b4ea468 Mon Sep 17 00:00:00 2001
From: weifs <605403358@qq.com>
Date: Wed, 21 Feb 2024 14:42:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E5=B7=B2=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=EF=BC=8C=E4=BB=BB=E5=8A=A1=E9=9D=A2=E6=9D=BF=E4=B9=9F?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=99=E4=B8=89=E4=B8=AA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E6=AF=8F=E6=AC=A1=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=EF=BC=8C=E9=83=BD=E4=BC=9A=E5=BC=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ReportController.php | 11 +++++++----
 resources/assets/js/pages/manage/file.vue     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

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))
                         ]));