From 82eedb474bc8fb6d6ac4fd201f8b713eeba4a658 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 19 Dec 2022 15:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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 467ac3628..bb221fd61 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
@@ -4226,14 +4226,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         || "technology_territory".equals(orderByField)){
 
                     conditionSb.append(" order by " + "CONVERT("+orderByField +" USING gbk) COLLATE gbk_chinese_ci");
+                    orderBySort(parameter, conditionSb);
                 }else if("issue_time".equals(orderByField)){
                     conditionSb.append(" order by " + (String) parameter.get("orderByField"));
-                }
-
-                if ("1".equals((String) parameter.get("orderBy"))) {
-                    conditionSb.append(" asc");//正序
-                } else if ("2".equals((String) parameter.get("orderBy"))) {
-                    conditionSb.append(" desc");//倒序
+                    orderBySort(parameter, conditionSb);
                 }
             } else {
                 conditionSb.append(" order by create_time desc");
@@ -4243,6 +4239,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return condition;
     }
 
+    private void orderBySort(Map<String, Object> parameter, StringBuilder conditionSb) {
+        if ("1".equals((String) parameter.get("orderBy"))) {
+            conditionSb.append(" asc");//正序
+        } else if ("2".equals((String) parameter.get("orderBy"))) {
+            conditionSb.append(" desc");//倒序
+        }
+    }
+
 
     /**
      * 收藏和订阅