1、controller join表排序问题修复
2、优化插件逻辑
This commit is contained in:
@@ -107,14 +107,14 @@ public class CrudOption<T> {
|
|||||||
if (ObjectUtil.isNotEmpty(queryTables)) {
|
if (ObjectUtil.isNotEmpty(queryTables)) {
|
||||||
// 取主表作为排序字段别名
|
// 取主表作为排序字段别名
|
||||||
QueryTable queryTable = queryTables.get(0);
|
QueryTable queryTable = queryTables.get(0);
|
||||||
tableAlias = "`" + queryTable.getName() + "`.`";
|
tableAlias = "`" + queryTable.getName() + "`.";
|
||||||
}
|
}
|
||||||
String order = requestParams.getStr("order",
|
String order = requestParams.getStr("order",
|
||||||
tableAnnotation.camelToUnderline() ? "create_time" : "createTime");
|
tableAnnotation.camelToUnderline() ? "create_time" : "createTime");
|
||||||
String sort = requestParams.getStr("sort", "desc");
|
String sort = requestParams.getStr("sort", "desc");
|
||||||
if (StrUtil.isNotEmpty(order) && StrUtil.isNotEmpty(sort)) {
|
if (StrUtil.isNotEmpty(order) && StrUtil.isNotEmpty(sort)) {
|
||||||
queryWrapper.orderBy(
|
queryWrapper.orderBy(
|
||||||
tableAlias + (tableAnnotation.camelToUnderline() ? StrUtil.toUnderlineCase(order) : order) + "`",
|
tableAlias + "`" + (tableAnnotation.camelToUnderline() ? StrUtil.toUnderlineCase(order) : order) + "`",
|
||||||
sort.equals("asc"));
|
sort.equals("asc"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user