diff --git a/module/execution/model.php b/module/execution/model.php index 48ae6a2cd7..50f8ac725f 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -2090,7 +2090,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'; @@ -5015,7 +5015,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 0cd56a5430..63c9f7dc94 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 b00ca7e94f..2cb785747d 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2780,7 +2780,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;