CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-07-03 21:08:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复 会出现 order by null的问题

Browse Source
This commit is contained in:
zhouhongfa 2019-07-31 23:28:39 +08:00
parent e775f45148
commit 3804443df4
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
datax-web/src/main/java/com/wugui/dataxweb/controller/BaseForm.java
View File

@ -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<T> {
//默认给true
page.setSearchCount(true);
}
//排序字段
//需要转为驼峰
List<String> 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<String> 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;
}