From 5a7335302851c86ae247c1f8b7548a7893c692b2 Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Thu, 18 Apr 2024 00:08:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8F=90=E6=8A=A5=E4=BA=BA=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/oa/OcrTaskchildPictureMapper.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index ce379a07..dfee42dd 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -1007,13 +1007,8 @@
                     order by tcp.${page.sortname} ${page.sortorder}
                 </if>
                 <if test="page.sortname != 'states'">
-                    order by pic.${page.sortname} ${page.sortorder}
+                    ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
                 </if>
-<!--                <if test="page.sortname != 'states'">-->
-<!--                    order by CONVERT(LEFT(pic.${page.sortname}, 1) USING gbk) ${page.sortorder},-->
-<!--                    CONVERT(SUBSTRING(pic.${page.sortname}, 2, 1) USING gbk) ${page.sortorder},-->
-<!--                    CONVERT(SUBSTRING(pic.${page.sortname}, 3, 1) USING gbk) ${page.sortorder}-->
-<!--                </if>-->
             </if>
             limit ${page.start}, ${page.Pagesize}
         </if>