From 9b6ca4c629a55c5fb71d75d78383d01bd6b2ef1a Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Fri, 19 Apr 2024 11:18:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E7=BB=88=E5=AE=A1?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 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 baed6175..36e38b88 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
@@ -1009,12 +1009,17 @@
         </if>
         <if test="page != null">
             <if test="page.sortname != null">
-                <if test="page.sortname == 'states'">
-                    order by tcp.${page.sortname} ${page.sortorder}
-                </if>
-                <if test="page.sortname != 'states'">
-                    ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
-                </if>
+                <choose>
+                    <when test="page.sortname == 'states'">
+                        ORDER BY tcp.${page.sortname} ${page.sortorder}
+                    </when>
+                    <when test="page.sortname == 'field1'">
+                        ORDER BY CONVERT(pic.${page.sortname} USING gbk) COLLATE gbk_chinese_ci ${page.sortorder}
+                    </when>
+                    <otherwise>
+                        ORDER BY pic.${page.sortname} ${page.sortorder}
+                    </otherwise>
+                </choose>
             </if>
             limit ${page.start}, ${page.Pagesize}
         </if>
-- 
2.39.3