From 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 14:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/common/util/WebUtils.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/common/util/WebUtils.java b/src/main/java/com/moral/common/util/WebUtils.java
index 01651a2..9850b79 100644
--- a/src/main/java/com/moral/common/util/WebUtils.java
+++ b/src/main/java/com/moral/common/util/WebUtils.java
@@ -29,8 +29,12 @@
params.put(unprefixed, values);
}
else {
- if (!ObjectUtils.isEmpty(values[0])) {
- params.put(unprefixed, values[0]);
+ if (!ObjectUtils.isEmpty(values[0]) && !"null".equalsIgnoreCase(values[0])) {
+ if ("sorter".equals(unprefixed)) {
+ params.put(unprefixed, values[0].replace("end", ""));
+ } else {
+ params.put(unprefixed, values[0]);
+ }
}
}
}
--
Gitblit v1.8.0