From 0988c1ad26d43c4b1696c8878ef66e27fd88c58b Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 19 Dec 2018 10:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=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/base/tool/HqlPack.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 2 +- .../java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index fa95759..6d4f83e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -393,6 +393,19 @@ public class HqlPack { } /** + * 封装in查询语句 + * @param data + * @param columnName + * @param result + */ + public static void getOrInPack(String data,String columnName, StringBuffer result){ + if (data!=null&&data.trim().length()>0) { + data = getSafeParam(data); + result.append(" or model."+columnName+" in ( "+ data+ " )"); + } + } + + /** * 封装in String查询语句 * @param data * @param columnName 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 61b930a..1aaf49c 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 @@ -63,7 +63,7 @@ public class SysMenu extends BaseBean { private String menuGrade; @Column(name="MENU_SORT") - @ApiParam(value ="资源排序", example = "1") + @ApiParam(value ="资源排序", example = "0") private String menuSort; @Column(name="MENU_URL") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 22aa6ae..3a9e23b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -100,4 +100,8 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="用户所有权限信息") private List menuList; + + @Transient + @ApiParam(value ="用户所有权限信息树数据") + private List menuListTree; }