From 238160a65f9e3248eccf0284688023e6768e632a Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 12 Mar 2019 10:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=BF=E9=97=AE=E5=B1=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 9e54499..760566e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1338,24 +1338,13 @@ public class WmsHqlPack { /** * 根据用户角色id列表查询数据权限信息 - * @param roleIds * @return */ - public static String packHqlWmsDataAuth(List roleIds) { - StringBuffer result = new StringBuffer(); - String data = String.join(",", roleIds); - HqlPack.getInPack(data,"roleCode",result); - getStringBuilderPack(new WmsDataAuth(), result); - return result.toString(); - } - - /** - * 根据用户角色id列表查询数据权限信息 - * @return - */ - public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) { + public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result); + String data = String.join(",", roleIds); + HqlPack.getInPackString(data, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); return result.toString(); }