From 39c0ad9c17e7268dde9210fdce58870e93368407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 16 May 2022 16:08:30 +0800
Subject: [PATCH 1/5] *Finish task #54207.

---
 module/task/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index f070271d1d..398eb17cb9 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1069,7 +1069,8 @@ class taskModel extends model
                 $this->dao->insert(TABLE_TASKSPEC)->data($taskSpec)->autoCheck()->exec();
             }
 
-            if($this->post->story != false) $this->loadModel('story')->setStage($this->post->story);
+            if($this->post->story  != false) $this->loadModel('story')->setStage($this->post->story);
+            elseif($oldTask->story != false) $this->loadModel('story')->setStage($oldTask->story);
             if($task->status == 'done')   $this->loadModel('score')->create('task', 'finish', $taskID);
             if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
             if($task->status != $oldTask->status) $this->loadModel('kanban')->updateLane($task->execution, 'task', $taskID);

From 4c968d5872d39d1ff8c21ccff46149a0fdb3081f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 16 May 2022 16:21:34 +0800
Subject: [PATCH 2/5] *Optimize the code.

---
 module/task/model.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 398eb17cb9..e2dcb02ef3 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1069,8 +1069,11 @@ class taskModel extends model
                 $this->dao->insert(TABLE_TASKSPEC)->data($taskSpec)->autoCheck()->exec();
             }
 
-            if($this->post->story  != false) $this->loadModel('story')->setStage($this->post->story);
-            elseif($oldTask->story != false) $this->loadModel('story')->setStage($oldTask->story);
+            if($this->post->story != $oldTask->story)
+            {
+                $this->loadModel('story')->setStage($this->post->story);
+                $this->loadModel('story')->setStage($oldTask->story);
+            }
             if($task->status == 'done')   $this->loadModel('score')->create('task', 'finish', $taskID);
             if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
             if($task->status != $oldTask->status) $this->loadModel('kanban')->updateLane($task->execution, 'task', $taskID);

From ecea8c61471844d169ab4c345819dc7660a30f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 16 May 2022 08:24:40 +0000
Subject: [PATCH 3/5] Update model.php

---
 module/task/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index e2dcb02ef3..b1d739e7af 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1072,7 +1072,7 @@ class taskModel extends model
             if($this->post->story != $oldTask->story)
             {
                 $this->loadModel('story')->setStage($this->post->story);
-                $this->loadModel('story')->setStage($oldTask->story);
+                $this->story->setStage($oldTask->story);
             }
             if($task->status == 'done')   $this->loadModel('score')->create('task', 'finish', $taskID);
             if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);

From 94af8b93af5df2383e5c123b284acbf55efc1208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 16 May 2022 16:26:19 +0800
Subject: [PATCH 4/5] *Optimize the code.

---
 module/task/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index b1d739e7af..83a9d9a7b6 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1075,7 +1075,7 @@ class taskModel extends model
                 $this->story->setStage($oldTask->story);
             }
             if($task->status == 'done')   $this->loadModel('score')->create('task', 'finish', $taskID);
-            if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
+            if($task->status == 'closed') $this->score->create('task', 'close', $taskID);
             if($task->status != $oldTask->status) $this->loadModel('kanban')->updateLane($task->execution, 'task', $taskID);
             $this->loadModel('action');
             $changed = $task->parent != $oldTask->parent;

From 3ae610d77dd53fc1b178f2a6076c58b968424795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 16 May 2022 08:27:21 +0000
Subject: [PATCH 5/5] Update model.php

---
 module/task/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/model.php b/module/task/model.php
index 83a9d9a7b6..b1d739e7af 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1075,7 +1075,7 @@ class taskModel extends model
                 $this->story->setStage($oldTask->story);
             }
             if($task->status == 'done')   $this->loadModel('score')->create('task', 'finish', $taskID);
-            if($task->status == 'closed') $this->score->create('task', 'close', $taskID);
+            if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
             if($task->status != $oldTask->status) $this->loadModel('kanban')->updateLane($task->execution, 'task', $taskID);
             $this->loadModel('action');
             $changed = $task->parent != $oldTask->parent;