diff --git a/niucloud/app/service/admin/upgrade/UpgradeService.php b/niucloud/app/service/admin/upgrade/UpgradeService.php
index ce08e66f3..7111ddc24 100644
--- a/niucloud/app/service/admin/upgrade/UpgradeService.php
+++ b/niucloud/app/service/admin/upgrade/UpgradeService.php
@@ -197,6 +197,7 @@ class UpgradeService extends BaseAdminService
         if (!$this->upgrade_task) return true;
 
         $steps = isset($this->upgrade_task['steps']) ? array_keys($this->upgrade_task['steps']) : array_keys($this->steps);
+        if (isset($this->upgrade_task['steps'])) $this->steps = $this->upgrade_task['steps'];
         $index = array_search($this->upgrade_task['step'], $steps);
         $step = $steps[ $index + 1 ] ?? '';
         $params = $this->upgrade_task['params'] ?? [];
diff --git a/niucloud/app/service/core/addon/WapTrait.php b/niucloud/app/service/core/addon/WapTrait.php
index 062990cb3..96db5254c 100644
--- a/niucloud/app/service/core/addon/WapTrait.php
+++ b/niucloud/app/service/core/addon/WapTrait.php
@@ -79,8 +79,11 @@ trait WapTrait
                 $addon_arr[] = $v[ 'key' ];
             }
         }
-        $addon_arr[] = $addon; // 追加新装插件
+        if(!empty($addon)) {
+            $addon_arr[] = $addon; // 追加新装插件
+        }
         $addon_arr = array_unique($addon_arr);
+
         foreach ($addon_arr as $k => $v) {
             $addon_path = $compile_path . str_replace('/', DIRECTORY_SEPARATOR, 'addon/' . $v . '/components/diy'); // 插件自定义组件根目录
             $addon_file_arr = getFileMap($addon_path);