From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：待审批节点，第三人账号不可进行修改 2.营销管理-销售台账：勾选单个导出会出现整个导出的情况，但只能显示父项、不能显示子项 3.营销管理-销售台账：点击下拉没有价格，点击详情有价格
---
src/main/java/com/ruoyi/framework/web/page/PageDomain.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 68d07b1..af24e6a 100644
--- a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
+++ b/src/main/java/com/ruoyi/framework/web/page/PageDomain.java
@@ -21,6 +21,9 @@
/** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
private String isAsc = "asc";
+ /** 鍒嗛〉鍙傛暟鍚堢悊鍖� */
+ private Boolean reasonable = true;
+
public String getOrderBy()
{
if (StringUtils.isEmpty(orderByColumn))
@@ -67,15 +70,32 @@
public void setIsAsc(String isAsc)
{
- // 鍏煎鍓嶇鎺掑簭绫诲瀷
- if ("ascending".equals(isAsc))
+ if (StringUtils.isNotEmpty(isAsc))
{
- isAsc = "asc";
+ // 鍏煎鍓嶇鎺掑簭绫诲瀷
+ if ("ascending".equals(isAsc))
+ {
+ isAsc = "asc";
+ }
+ else if ("descending".equals(isAsc))
+ {
+ isAsc = "desc";
+ }
+ this.isAsc = isAsc;
}
- else if ("descending".equals(isAsc))
+ }
+
+ public Boolean getReasonable()
+ {
+ if (StringUtils.isNull(reasonable))
{
- isAsc = "desc";
+ return Boolean.TRUE;
}
- this.isAsc = isAsc;
+ return reasonable;
+ }
+
+ public void setReasonable(Boolean reasonable)
+ {
+ this.reasonable = reasonable;
}
}
--
Gitblit v1.9.3