From 43bf2d2dba759e7215ed7f54ef110767697c2a8e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 20 Dec 2018 18:40:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=A6=96?= =?UTF-8?q?=E5=AD=97=E6=AF=8D=E7=BC=A9=E5=86=99=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2=E9=80=92=E5=BD=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 8 ++++---- 2 files changed, 9 insertions(+), 5 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 b78d1de..fd5393e 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 @@ -37,6 +37,10 @@ public class SysMenu extends BaseBean { @ApiParam(value ="功能名称") private String name; + @Column(name="NAME_ZH_SHORTENING") + @ApiParam(value ="功能名称中文简写") + private String nameZhShortening; + @Column(name="MENU_CODE") @ApiParam(value ="功能代码") private String menuCode; @@ -65,7 +69,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_SORT") @ApiParam(value ="资源排序", example = "0") - private String menuSort; + private Integer menuSort; @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") 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 f77920e..1d8de14 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 @@ -133,12 +133,12 @@ public class CoreHqlPack { public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); - if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ - department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - } +// if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ +// department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); +// } HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); +// HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);