From 0b0ee64818d88c9537019950332ee74e745a6841 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 14 Dec 2022 11:07:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F-=E8=A1=A8?=
 =?UTF-8?q?=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/OnlCgformCollectionMapper.xml   | 18 ++++++++++++++++--
 .../impl/OnlCgformCollectionServiceImpl.java   |  2 +-
 .../impl/BussDocumentLibraryEOServiceImpl.java |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml
index 7fd9b3043..1201ec8f4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml
@@ -54,6 +54,20 @@
                 #{item}
             </foreach>
         </if>
-        order by occ.create_time desc
+        <if test="params.orderByField == 'serial_number' or params.orderByField == 'title'">
+            order by CONVERT( ${params.orderByField} USING gbk) COLLATE gbk_chinese_ci
+            <if test="params.orderBy != null and params.orderBy != ''">
+                ${params.orderBy}
+            </if>
+        </if>
+        <if test="params.orderByField == 'create_time'">
+            order by occ.create_time
+            <if test="params.orderBy != null and params.orderBy != ''">
+                ${params.orderBy}
+            </if>
+        </if>
+        <if test="params.orderByField == null or params.orderByField == ''">
+            order by occ.create_time desc
+        </if>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
index 90371551a..43d36e1dd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java
@@ -297,4 +297,4 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl<OnlCgformCollect
 			throw new JeroBootException("删除订阅信息失败！");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index d00224a42..467ac3628 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -4225,7 +4225,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         || "region".equals(orderByField)
                         || "technology_territory".equals(orderByField)){
 
-                    conditionSb.append(" order by " + "CONVERT("+orderByField +"USING gbk) COLLATE gbk_chinese_ci");
+                    conditionSb.append(" order by " + "CONVERT("+orderByField +" USING gbk) COLLATE gbk_chinese_ci");
                 }else if("issue_time".equals(orderByField)){
                     conditionSb.append(" order by " + (String) parameter.get("orderByField"));
                 }