From 98d25fa16e4d4f61d04dc776bd161976cfa2eb2e Mon Sep 17 00:00:00 2001
From: ytzjf <563417+ytzjf@user.noreply.gitee.com>
Date: Wed, 28 Jul 2021 09:57:11 +0800
Subject: [PATCH] update ruoyi-ui/src/utils/zipdownload.js. BLOB下载时清除URL对象引用
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
index e681c67..e97b4e5 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java
@@ -67,15 +67,18 @@
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))
- {
- isAsc = "desc";
- }
- this.isAsc = isAsc;
}
}
--
Gitblit v1.9.3