| @@ -28,7 +28,6 @@ public class BaseEntity implements Serializable { | |||||
| return sortColumns; | return sortColumns; | ||||
| } | } | ||||
| String result = null; | |||||
| try { | try { | ||||
| //扫描子类SortColumn注解的属性,替换sortColumn | //扫描子类SortColumn注解的属性,替换sortColumn | ||||
| if(StringUtils.isNotBlank(sortColumn)) { | if(StringUtils.isNotBlank(sortColumn)) { | ||||
| @@ -50,19 +49,18 @@ public class BaseEntity implements Serializable { | |||||
| for (Field field : fields) { | for (Field field : fields) { | ||||
| SortColumn sortColumnField = field.getAnnotation(SortColumn.class); | SortColumn sortColumnField = field.getAnnotation(SortColumn.class); | ||||
| if (sortColumnField != null && field.getName().equals(sortColumn)) { | if (sortColumnField != null && field.getName().equals(sortColumn)) { | ||||
| result = sortColumnField.column() + " "+sortOrder; | |||||
| return sortColumnField.column() + " "+sortOrder; | |||||
| } | } | ||||
| } | } | ||||
| //默认驼峰解析 | //默认驼峰解析 | ||||
| result = underscoreName(sortColumn) +" "+sortOrder; | |||||
| return underscoreName(sortColumn) +" "+sortOrder; | |||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("BaseEntity.getSortColumn解析失败",e); | logger.error("BaseEntity.getSortColumn解析失败",e); | ||||
| e.printStackTrace(); | e.printStackTrace(); | ||||
| } | } | ||||
| logger.info("--------order:"+result); | |||||
| return result; | |||||
| return sortColumns; | |||||
| } | } | ||||
| /** | /** | ||||