From e6b6097d1e9186ae2f0a814599104da898577d2c Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Sat, 6 Dec 2025 10:52:13 +0800
Subject: [PATCH] 排序字段兼容

---
 urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java
index e40dfa9..201efa6 100644
--- a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java
+++ b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/pojo/PageParam.java
@@ -36,21 +36,37 @@ public class PageParam implements Serializable {
     private Integer pageSize = PAGE_SIZE;
 
     /**
-     * 排序字段
+     * 排序字段（默认 id）
      */
     private String orderByColumn = "id";
     /**
-     * 排序方向：asc（升序）/ desc（降序）
+     * 排序方向：仅支持 asc（升序）/ desc（降序），默认 desc
      */
     private String isAsc = "desc";
     /**
-     * sortAsc=true（升序）
+     * 排序方向布尔值：true=asc，false=desc（与 isAsc 联动，无需前端传递）
      */
     private Boolean sortAsc = true;
 
     public void setIsAsc(String isAsc) {
-        this.isAsc = StringUtils.hasText(isAsc) ? isAsc.trim() : "desc";
-        this.sortAsc = "asc".equalsIgnoreCase(this.isAsc);
+        // 步骤1：处理空值/空白字符串 → 直接设为默认 desc
+        if (!StringUtils.hasText(isAsc)) {
+            this.isAsc = "desc";
+            this.sortAsc = false;
+            return;
+        }
+
+        // 步骤2：去空格并转为小写，判断是否为合法值
+        String trimmedIsAsc = isAsc.trim().toLowerCase();
+        if ("asc".equals(trimmedIsAsc) || "desc".equals(trimmedIsAsc)) {
+            // 合法值：直接赋值并同步 sortAsc
+            this.isAsc = trimmedIsAsc;
+            this.sortAsc = "asc".equals(trimmedIsAsc);
+        } else {
+            // 非法值：兜底为 desc，同步 sortAsc 为 false
+            this.isAsc = "desc";
+            this.sortAsc = false;
+        }
     }
 
 }
--
libgit2 0.21.4