From 87bdabb8f5cd3feec9b190abbc2551bf79609b74 Mon Sep 17 00:00:00 2001
From: xiong_cl <140612616@qq.com>
Date: Wed, 10 Apr 2024 17:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=BC=E5=90=88=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=85=8D=E7=BD=AE=E5=A4=B1=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shandan/browser/service/MetadataSearchService.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java
index 885c764..8a423bb 100644
--- a/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java
+++ b/shandan-browser/src/main/java/com/keyware/shandan/browser/service/MetadataSearchService.java
@@ -119,7 +119,12 @@ public class MetadataSearchService {
             if (field != null) {
                 TableField tableField = field.getAnnotation(TableField.class);
                 if (tableField != null && StringUtils.hasText(tableField.value())) {
-                    queryWrapper.orderBy(true, sort.getSort().equalsIgnoreCase("asc"), tableField.value());
+                    //没有过滤条件时，order by前面会拼接and，导致查询报错
+                    if(condition.getConditions().size()<=0){
+                        queryWrapper.last("1=1 ORDER BY "+ tableField.value() + (sort.getSort().equalsIgnoreCase("asc") ? " ASC " :" DESC "));
+                    }else {
+                        queryWrapper.orderBy(true, sort.getSort().equalsIgnoreCase("asc"), tableField.value());
+                    }
                 }
             }
         }