From de17aa27beae167ddd9f35e1ba1f0f326c67b076 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 8 Jul 2025 11:46:50 +0800
Subject: [PATCH] * [bug#63790,done,0.3h] remove changed status when the status
 is closed or cancel.

---
 module/execution/model.php   | 4 ++--
 module/programplan/model.php | 2 +-
 module/task/model.php        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 54471415ba..7d67ffb057 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2088,7 +2088,7 @@ class executionModel extends model
                 /* Story changed or not. */
                 $task->storyVersion = zget($storyVersionPairs, $task->id, $task->storyVersion);
                 $task->needConfirm  = false;
-                if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
+                if(!empty($task->storyStatus) && $task->storyStatus == 'active' && !in_array($task->status, array('cancel', 'closed')) && $task->latestStoryVersion > $task->storyVersion)
                 {
                     $task->needConfirm = true;
                     $task->status      = 'changed';
@@ -5013,7 +5013,7 @@ class executionModel extends model
             }
 
             $task->needConfirm = false;
-            if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
+            if(!empty($task->storyStatus) && $task->storyStatus == 'active' && !in_array($task->status, array('closed', 'cancel')) && $task->latestStoryVersion > $task->storyVersion)
             {
                 $task->needConfirm = true;
                 $task->rawStatus   = $task->status;
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 8c1d22bfb6..9f504bdb84 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -945,7 +945,7 @@ class programplanModel extends model
             /* Story changed or not. */
             $task->storyVersion = zget($storyVersionPairs, $task->id, $task->storyVersion);
             $task->needConfirm  = false;
-            if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
+            if(!empty($task->storyStatus) && $task->storyStatus == 'active' && !in_array($task->status, array('cancel', 'closed')) && $task->latestStoryVersion > $task->storyVersion)
             {
                 $task->needConfirm = true;
                 $task->status      = 'changed';
diff --git a/module/task/model.php b/module/task/model.php
index c91b14e219..3bd06757b5 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2782,7 +2782,7 @@ class taskModel extends model
 
         /* Story changed or not. */
         $task->needConfirm = false;
-        if(!empty($task->storyStatus) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
+        if(!empty($task->storyStatus) && !in_array($task->status, array('cancel', 'closed')) && $task->storyStatus == 'active' && $task->latestStoryVersion > $task->storyVersion)
         {
             $task->needConfirm = true;
             $task->rawStatus   = $task->status;