diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 47985e1c08..d832e505bc 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -8100,8 +8100,8 @@ class upgradeModel extends model
         $createRequired = str_replace(',line,', ',', ",$createRequired,");
         $editRequired   = str_replace(',line,', ',', ",$editRequired,");
 
-        $this->setting->setItem('system.product.create.requiredFields', trim($createRequired, ','));
-        $this->setting->setItem('system.product.edit.requiredFields', trim($editRequired, ','));
+        if(!empty(trim($createRequired, ','))) $this->setting->setItem('system.product.create.requiredFields', trim($createRequired, ','));
+        if(!empty(trim($editRequired, ',')))   $this->setting->setItem('system.product.edit.requiredFields', trim($editRequired, ','));
 
         return true;
     }
diff --git a/module/upgrade/test/model/removeproductlinerequired.php b/module/upgrade/test/model/removeproductlinerequired.php
old mode 100644
new mode 100755
index e2abf65962..1c4c97e696
--- a/module/upgrade/test/model/removeproductlinerequired.php
+++ b/module/upgrade/test/model/removeproductlinerequired.php
@@ -5,11 +5,12 @@ declare(strict_types=1);
 /**
 
 title=测试 upgradeModel->removeProductLineRequired().
+timeout=0
 cid=1
 
 - 检测产品线必填字段是否已经被移除 @1
 
-**/
+*/
 
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/upgrade.class.php';
@@ -31,8 +32,8 @@ function initProductLineRequired()
     if(!in_array('line', $createRequiredList)) $createRequiredList[] = 'line';
     if(!in_array('line', $editRequiredList))   $editRequiredList[] = 'line';
 
-    $tester->setting->setItem('system.product.create.requiredFields', implode(',', $createRequiredList));
-    $tester->setting->setItem('system.product.edit.requiredFields', implode(',', $editRequiredList));
+    if(!empty(trim($createRequired, ','))) $tester->setting->setItem('system.product.create.requiredFields', implode(',', $createRequiredList));
+    if(!empty(trim($editRequired, ','))) $tester->setting->setItem('system.product.edit.requiredFields', implode(',', $editRequiredList));
 }
 
 function getCheckResult()
@@ -54,4 +55,4 @@ initProductLineRequired();
 
 $upgrade->removeProductLineRequired();
 
-r(getCheckResult()) && p('') && e(1);   //检测产品线必填字段是否已经被移除
+r(getCheckResult()) && p('') && e(1);   //检测产品线必填字段是否已经被移除
\ No newline at end of file