From a58ff19de22e87595b6a0001368bf8a9d9375434 Mon Sep 17 00:00:00 2001
From: sunhao <sunhao@chandao.com>
Date: Tue, 10 Jun 2025 13:30:37 +0800
Subject: [PATCH]  * [misc] fix convert charset on upgrade not work.

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

diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php
index f755866ccf..6fa9fbbe93 100644
--- a/module/upgrade/config/upgradeflow.php
+++ b/module/upgrade/config/upgradeflow.php
@@ -108,9 +108,10 @@ $config->upgrade->execFlow['20_8']        = array('functions' => 'processWorkflo
 $config->upgrade->execFlow['21_1']        = array('functions' => 'processCacheConfig');
 $config->upgrade->execFlow['21_2']        = array('functions' => 'importBuildinWorkflow,addCharterApprovalFlow,processCharterFileConfig,processCharterStatus', 'params' => array('importBuildinWorkflow' => array('rnd', 'charter')));
 $config->upgrade->execFlow['21_3']        = array('functions' => 'createDevOpsChartModule');
-$config->upgrade->execFlow['21_6_beta']   = array('functions' => 'convertCharset,processCharterBranch');
+$config->upgrade->execFlow['21_6_beta']   = array('functions' => 'processCharterBranch');
 $config->upgrade->execFlow['21_6_1']      = array('xxsqls' => "$appRoot/db/upgradexuanxuan9.1.2.sql");
 $config->upgrade->execFlow['21_7']        = array('functions' => 'fixWorkflowNameForExecution');
+$config->upgrade->execFlow['21_7_1']      = array('functions' => 'convertCharset');
 
 if(!empty($config->isINT))
 {
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 384df60d56..cc6c219385 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -10870,11 +10870,11 @@ class upgradeModel extends model
         if(empty($matches[1])) return true;
 
         /* 转换数据库文件中的表的字符集。Convert tables charset. */
-        // foreach($matches[1] as $table)
-        // {
-        //     $table = str_replace('zt_', $this->config->db->prefix, $table);
-        //     $this->dao->query("ALTER TABLE `$table` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci");
-        // }
+        foreach($matches[1] as $table)
+        {
+            $table = str_replace('zt_', $this->config->db->prefix, $table);
+            $this->dao->query("ALTER TABLE `$table` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci");
+        }
 
         return true;
     }