From 2753f64b7ebfe81ce4c45667683701f40070a8cd Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 28 Nov 2018 19:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 10 +++++++++- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 23fa593..754a668 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -56,7 +56,15 @@ public class SysMenu extends BaseBean { @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") private String menuClassPath; - + + @Column(name="MENU_GRADE") + @ApiParam(value ="资源等级", example = "1") + private String menuGrade; + + @Column(name="MENU_SORT") + @ApiParam(value ="资源排序", example = "1") + private String menuSort; + @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7e2a33c..603a79a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -130,12 +130,6 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); - // 默认排序 - if(department.getOrderByParam().isEmpty()){ - department.setOrderByParam("departmentSort"); - department.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - } - return result.toString(); }