From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/common/util/WebUtils.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/common/util/WebUtils.java b/src/main/java/com/moral/common/util/WebUtils.java
index fc167c0..9850b79 100644
--- a/src/main/java/com/moral/common/util/WebUtils.java
+++ b/src/main/java/com/moral/common/util/WebUtils.java
@@ -6,8 +6,8 @@
import javax.servlet.ServletRequest;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
public class WebUtils extends org.springframework.web.util.WebUtils {
public static Map<String, Object> getParametersStartingWith(ServletRequest request, String prefix) {
@@ -29,8 +29,12 @@
params.put(unprefixed, values);
}
else {
- if (StringUtils.isNotBlank(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