p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

解决表格在对无Token属性的复合属性列排序时，后台排序SQL构建错误导致排序查询报错的BUG

This commit is contained in:
datagear 2019-02-15 15:48:24 +08:00
parent 0dc1bb21da
commit a34019b2e7
1 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
datagear-persistence/src/main/java/org/datagear/persistence/support/SelectPersistenceOperation.java
View File

@ -1666,7 +1666,7 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
Order[] orders = query.getOrders();
Order[] re = new Order[orders.length];
List<Order> re = new ArrayList<Order>();
for (int i = 0; i < orders.length; i++)
{
@ -1675,21 +1675,65 @@ public class SelectPersistenceOperation extends AbstractModelPersistenceOperatio
String orderName = order.getName();
String orderType = order.getType();
ColumnPropertyPath exactlyMatched = null;
List<ColumnPropertyPath> startsWiths = null;
boolean startsWithsHasToken = false;
for (ColumnPropertyPath columnPropertyPath : selectColumnPropertyPaths)
{
String propertyPath = columnPropertyPath.getPropertyPath();
if (propertyPath.startsWith(orderName) && (propertyPath.length() == orderName.length()
|| columnPropertyPath.isSizeColumn() || columnPropertyPath.isToken()))
if (propertyPath.startsWith(orderName))
{
orderName = columnPropertyPath.getQuoteColumnName();
// 基本属性
if (propertyPath.length() == orderName.length())
{
exactlyMatched = columnPropertyPath;
break;
}
// 单元复合属性、多元属性size
else
{
if (startsWiths == null)
startsWiths = new ArrayList<ColumnPropertyPath>();
startsWiths.add(columnPropertyPath);
if (!startsWithsHasToken && columnPropertyPath.isToken())
startsWithsHasToken = true;
}
}
}
re[i] = Order.valueOf(orderName, orderType);
if (exactlyMatched != null)
{
re.add(Order.valueOf(exactlyMatched.getQuoteColumnName(), orderType));
}
else if (startsWiths != null)
{
for (int j = 0; j < startsWiths.size(); j++)
{
ColumnPropertyPath startsWith = startsWiths.get(j);
// 先取所有Token属性
if (startsWithsHasToken)
{
if (startsWith.isToken())
re.add(Order.valueOf(startsWith.getQuoteColumnName(), orderType));
}
// 取前3个属性
else
{
if (j >= 3)
break;
re.add(Order.valueOf(startsWith.getQuoteColumnName(), orderType));
}
}
}
}
return re;
return re.toArray(new Order[re.size()]);
}
/**