From 43bf2d2dba759e7215ed7f54ef110767697c2a8e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 20 Dec 2018 18:40:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A6=96=E5=AD=97=E6=AF=8D=E7=BC=A9=E5=86=99=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=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); From 5a5ed8220180ca8d97c5bf90072b47f9f20e5e96 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 20 Dec 2018 21:37:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Cloud=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=BB=84=E7=BB=87=E6=88=96=E8=80=85=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E7=9A=84=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/platform/bean/SysRefUserDepartment.java | 10 +++++++++- .../i3plus/pojo/platform/bean/SysUserInfo.java | 6 +++++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 21 +++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index fd618e5..c312892 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -45,11 +45,19 @@ public class SysRefUserDepartment extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long departmentId; - @Column(name="DEPARTMENT_NAME_RDD") @ApiParam(value ="部门名称") private String departmentNameRdd; + @Column(name="ORGANIZE_ID") + @ApiParam(value ="组织ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long organizeId; + + @Column(name="ORGANIZE_NAME_RDD") + @ApiParam(value ="组织名称") + private String organizeNameRdd; + public SysRefUserDepartment() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 84d5d02..28742da 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -122,7 +122,7 @@ public class SysUserInfo extends BaseBean { private List departmentList; @Transient - @ApiParam("用户的部门ID信息") + @ApiParam("用户的部门ID信息集合") private List departmentIdList; @Transient @@ -138,6 +138,10 @@ public class SysUserInfo extends BaseBean { private List organizeList; @Transient + @ApiParam("用户的组织ID信息集合") + private List organizeIdList; + + @Transient @ApiParam(value ="用户岗位信息") private SysDepartment department; 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 1d8de14..c3dbd1b 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 @@ -390,6 +390,27 @@ public class CoreHqlPack { } /** + * 用户信息 复杂查询拼接 + * @param userInfo + * @return + */ + public static String packHqlSysUserInfo(SysUserInfo userInfo,List idList){ + StringBuffer result = new StringBuffer(); + + // And + HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); + if(idList != null && idList.size() > 0){ + HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); + } + + // Like + HqlPack.getStringLikerPack(userInfo.getName(),"name",result); + HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); + + return result.toString(); + } + + /** * 查询语言代码是否重复 * @param localeLanguage * @return