From 7c952822dbca9b7737c71b297e3dae4de799a114 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 27 Feb 2022 11:06:18 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php        | 11 ++++++-----
 .../assets/js/pages/manage/components/ProjectList.vue |  6 ++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index ab670fbf1..7d71d1fd8 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -604,13 +604,14 @@ class ProjectController extends AbstractController
                 if (!is_array($item['task'])) continue;
                 $index = 0;
                 foreach ($item['task'] as $task_id) {
-                    ProjectTask::whereId($task_id)->whereProjectId($project->id)->update([
+                    if (ProjectTask::whereId($task_id)->whereProjectId($project->id)->whereCompleteAt(null)->update([
                         'column_id' => $item['id'],
                         'sort' => $index
-                    ]);
-                    ProjectTask::whereParentId($task_id)->whereProjectId($project->id)->update([
-                        'column_id' => $item['id'],
-                    ]);
+                    ])) {
+                        ProjectTask::whereParentId($task_id)->whereProjectId($project->id)->update([
+                            'column_id' => $item['id'],
+                        ]);
+                    }
                     $index++;
                 }
             }
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 6e07c1d86..75d1b3273 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -623,10 +623,8 @@ export default {
                 column.tasks = this.transforTasks(allTask.filter(task => {
                     return task.column_id == column.id;
                 })).sort((a, b) => {
-                    let at1 = $A.Date(a.complete_at),
-                        at2 = $A.Date(b.complete_at);
-                    if (at1 || at2) {
-                        return at1 - at2;
+                    if (a.complete_at || b.complete_at) {
+                        return $A.Date(a.complete_at) - $A.Date(b.complete_at);
                     }
                     if (a.sort != b.sort) {
                         return a.sort - b.sort;