diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9ef4ab0..c6e3a32 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -154,30 +154,19 @@ public abstract class BaseBean implements Serializable { // @ApiParam(value = "多列排序") // @AnnoOutputColumn(hidden = true) // public LinkedHashMap sortParamMap; -// -// //排序方式 -// public String orderBy(){ -// StringBuffer result = new StringBuffer(" order by "); -// -// if (sortParamMap != null && sortParamMap.size() != 0) { -// for (String key : sortParamMap.keySet()) { -// packOrderByHql(result,orderByParam,ascOrDesc); -// } -// } else if (orderByParam != null && orderByParam.trim().length() > 0) { -// packOrderByHql(result,orderByParam,ascOrDesc); -// }else{ -// return ""; -// } -// return result.subSequence(0, result.length() - 1).toString(); -// } - - private void packOrderByHql(StringBuffer stringBuffer, String orderByParam, Integer ascOrDesc) { - stringBuffer.append(" ").append(orderByParam); - if (ascOrDesc == null || ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { - stringBuffer.append(" asc"); - } else { - stringBuffer.append(" desc,"); + + //排序方式 + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } } + return result; } }