|
|
@@ -62,14 +62,15 @@ public abstract class BusJcabServiceImpl {
|
|
|
// 如果排序字段不是BusJcab类的属性时,取默认排序字段
|
|
|
log.info("前端指定的排序字段 - {}", jcab.getOrderBy());
|
|
|
if (StringUtils.isNotEmpty(jcab.getOrderBy())) {
|
|
|
- jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
|
|
|
- if (JcebOrderFieldEnum.OPERATION_DATE.getField().equals(jcab.getOrderBy())) {
|
|
|
- jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getField());
|
|
|
+ if (JcebOrderFieldEnum.OPERATION_DATE.getAttribute().equals(jcab.getOrderBy())) {
|
|
|
+ jcab.setOrderBy(JcebOrderFieldEnum.CHECK_DATE.getAttribute());
|
|
|
}
|
|
|
- if(!fieldList.contains(jcab.getOrderBy())){
|
|
|
+ if (!fieldList.contains(jcab.getOrderBy())) {
|
|
|
log.info("排序字段名在当前表不存在 - {}", jcab.getOrderBy());
|
|
|
jcab.setOrderBy(null);
|
|
|
jcab.setIsAsc(null);
|
|
|
+ } else {
|
|
|
+ jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
|
|
|
}
|
|
|
} else {
|
|
|
// 默认倒序排列
|