pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-01-02 19:15:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决issue#2639 2.4.5升级后出现后端排序报错

Browse Source
This commit is contained in:
zhangdaiscott
2021-06-07 18:21:13 +08:00
parent 4d7b3d5d48
commit 743beff555
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
View File

@ -235,12 +235,12 @@ public class QueryGenerator {
// 将现有排序 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1,column2 desc" // 将现有排序 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1,column2 desc"
// 修改为 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1 desc,column2 desc" // 修改为 _ 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1 desc,column2 desc"
if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) { if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) {
queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); //queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
String columnStr = oConvertUtils.camelToUnderline(column); String columnStr = oConvertUtils.camelToUnderline(column);
String[] columnArray = columnStr.split(","); String[] columnArray = columnStr.split(",");
queryWrapper.orderByAsc(columnArray); queryWrapper.orderByAsc(columnArray);
} else { } else {
queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); //queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
String columnStr = oConvertUtils.camelToUnderline(column); String columnStr = oConvertUtils.camelToUnderline(column);
String[] columnArray = columnStr.split(","); String[] columnArray = columnStr.split(",");
queryWrapper.orderByDesc(columnArray); queryWrapper.orderByDesc(columnArray);