!36 多条件排序无效问题修正

Merge pull request !36 from 燕山石头/deploy-wl

!36 多条件排序无效问题修正
Merge pull request !36 from 燕山石头/deploy-wl
JEECG开源社区 · Gitee
2 parents fe7b2c32 26c62b91
Showing 1 changed file with 11 additions and 2 deletions
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
@@ -230,10 +230,19 @@ public class QueryGenerator {
 			//SQL注入check
 			SqlInjectionUtil.filterContent(column); 
  
+			// 排序规则修改
+			// 将现有排序
+			// 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1,column2 desc"
+			// 修改为
+			// 前端传递排序条件{....,column: 'column1,column2',order: 'desc'} 翻译成sql "column1 desc,column2 desc"
 			if (order.toUpperCase().indexOf(ORDER_TYPE_ASC)>=0) {
-				queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
+				String columnStr = oConvertUtils.camelToUnderline(column);
+				String[] columnArray = columnStr.split(",");
+				queryWrapper.orderByAsc(columnArray);
 			} else {
-				queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
+				String columnStr = oConvertUtils.camelToUnderline(column);
+				String[] columnArray = columnStr.split(",");
+				queryWrapper.orderByDesc(columnArray);
 			}
 		}
 	}