From b9b0a2f5d7f30fefd038e22ae3617a4cec562b35 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 19 Dec 2022 14:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8--=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ParamsManifestEOMapper.xml        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 3b9d184b2..3bfab7e11 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -72,28 +72,28 @@
         ) tmp_tb
         <include refid="BaseQuerySql"/>
         <if test="paramsManifestEO.orderByField == 'create_time'">
-            order by tmp_tb.create_time
+            order by CONVERT( tmp_tb.create_time USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'create_by'">
-            order by tmp_tb.create_by
+            order by CONVERT( tmp_tb.create_by USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'version'">
-            order by tmp_tb.version
+            order by CONVERT( tmp_tb.version USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'finish_time'">
-            order by tmp_tb.finish_time
+            order by CONVERT( tmp_tb.finish_time USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'project_version'">
-            order by tmp_tb.project_version
+            order by CONVERT( tmp_tb.project_version USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'params_template_name'">
-            order by tmp_tb.params_template_name
+            order by  CONVERT( tmp_tb.params_template_name USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'state'">
-            order by tmp_tb.state
+            order by CONVERT( tmp_tb.state USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderByField == 'title'">
-            order by tmp_tb.title
+            order by CONVERT( tmp_tb.title USING gbk) COLLATE gbk_chinese_ci
         </if>
         <if test="paramsManifestEO.orderBy == 1">
             asc