From 74958bd6b2e5d1b53f3ecd08ba28c8dbe0315465 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Dec 2021 08:44:41 +0800
Subject: [PATCH] * Fix bug #17208.

---
 module/upgrade/js/mergeprogram.js | 7 +++----
 module/upgrade/model.php          | 6 ------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 210e16600e..dde8bc3f65 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -441,17 +441,16 @@ $(function()
             if(lineID && $('[data-lineid=' + lineID + ']').length > 0 && !$('[data-lineid=' + lineID + ']').prop('checked')) $('[data-lineid=' + lineID + ']').prop('checked', true);
 
             $('#programName').val($("[lineid='" + lineID + "']").find('a').text());
-            $('#programStatus').val('wait');
-            $('#programStatus').trigger('chosen:updated');
         }
         else
         {
             $('[data-product=' + value + ']').prop('checked', false)
             $('#programName').val('');
-            $('#programStatus').val('wait');
-            $('#programStatus').trigger('chosen:updated');
         }
 
+        $('#programStatus').val('wait');
+        $('#programStatus').trigger('chosen:updated');
+
         var checkedProject = true;
         if($('[id^=productLines]').length > 0)
         {
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 69bbef0ccd..8293c4e4f9 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4369,12 +4369,6 @@ class upgradeModel extends model
             $this->loadModel('action')->create('program', $programID, 'openedbysystem');
             if($data->programStatus == 'closed') $this->loadModel('action')->create('program', $programID, 'closedbysystem');
         }
-        else
-        {
-            $programID = $data->programID ? $data->programID : $data->programs;
-            $this->dao->update(TABLE_PROGRAM)->set('status')->eq($data->programStatus)->where('id')->eq($programID)->exec();
-            if($data->programStatus == 'closed') $this->loadModel('action')->create('program', $programID, 'openedbysystem');
-        }
 
         if(isset($data->newLine))
         {