diff --git a/Makefile b/Makefile
index ea43b9ace5..1a10f03c1b 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ zentaoxx:
 	sed -i "s/text NOT NULL DEFAULT ''/text NULL/" zentaoxx/db_bak/*.sql
 	sed -i "s/text NOT NULL/text NULL/" zentaoxx/db_bak/*.sql
 	sed -i "s/ENGINE=MyISAM/ENGINE=InnoDB/" zentaoxx/db_bak/*.sql
-	sed -i "s/utf8/utf8mb4/" zentaoxx/db_bak/*.sql
+	sed -i "s/utf8/utf8mb4/g" zentaoxx/db_bak/*.sql
 	sed -i "/`xxb_user` ADD `clientStatus`/d; /`xxb_user` ADD `clientLang`/d; /`xxb_file` CHANGE `pathname`/d" zentaoxx/db_bak/xuanxuan.sql
 	cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/
 	rm -rf zentaoxx/db_bak/
diff --git a/module/setting/model.php b/module/setting/model.php
index d104e59af7..5519e4f07d 100644
--- a/module/setting/model.php
+++ b/module/setting/model.php
@@ -184,7 +184,7 @@ class settingModel extends model
         $item->module  = $module;
         $item->section = $section;
         $item->key     = $key;
-        $item->vision  = $vision;
+        if(empty($this->app->upgrading)) $item->vision = $vision;
 
         return $item;
     }