From 3804443df4e3e837353b824e8e7bf4b99ac0dcbd Mon Sep 17 00:00:00 2001 From: zhouhongfa Date: Wed, 31 Jul 2019 23:28:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=20order=20by=20null=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/wugui/dataxweb/controller/BaseForm.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java b/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java index 35ccaa9f..6ec26149 100644 --- a/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java +++ b/datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java @@ -1,12 +1,10 @@ package com.wugui.dataxweb.controller; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.common.collect.ImmutableList; import com.wugui.dataxweb.util.ServletUtils; import lombok.extern.slf4j.Slf4j; @@ -14,7 +12,6 @@ import javax.servlet.http.HttpServletRequest; import java.net.URLDecoder; import java.util.Enumeration; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; /** @@ -162,18 +159,6 @@ public class BaseForm { //默认给true page.setSearchCount(true); } - - //排序字段 - //需要转为驼峰 - List ascs = CollUtil.toList(this.getString("ascs").split(",")); - ImmutableList.Builder finalBuilderAscs = new ImmutableList.Builder(); - ascs.forEach(e -> finalBuilderAscs.add(StrUtil.replace(e, "([A-Z])", parameters -> "_" + parameters.group().toLowerCase()))); - page.setAscs(finalBuilderAscs.build()); - - ImmutableList.Builder finalBuilderDescs = new ImmutableList.Builder(); - List descs = CollUtil.toList(this.getString("descs").split(",")); - descs.forEach(e -> finalBuilderDescs.add(StrUtil.replace(e, "([A-Z])", parameters -> "_" + parameters.group().toLowerCase()))); - page.setDescs(finalBuilderDescs.build()); return page; }