From acaf0e69a594f36ef9be6749c2b8d66e4ef6123b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 15:54:33 +0800
Subject: [PATCH] feat: 发货审批根据合同号合并到第一条(未审批)的记录中
---
src/main/java/com/ruoyi/framework/web/page/PageDomain.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java b/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
index 86093ae..af24e6a 100644
--- a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
+++ b/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
@@ -22,7 +22,7 @@
private String isAsc = "asc";
/** 鍒嗛〉鍙傛暟鍚堢悊鍖� */
- private Boolean reasonable = false;
+ private Boolean reasonable = true;
public String getOrderBy()
{
@@ -87,6 +87,10 @@
public Boolean getReasonable()
{
+ if (StringUtils.isNull(reasonable))
+ {
+ return Boolean.TRUE;
+ }
return reasonable;
}
--
Gitblit v1.9.3