From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
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