diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/DimensionTerm.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/DimensionTerm.java index 9760376d2..11b447e7d 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/DimensionTerm.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/DimensionTerm.java @@ -28,19 +28,19 @@ public class DimensionTerm extends AbstractTermFragmentBuilder { } public static > T inject(T query, - String column, - String dimensionType, - List userId) { + String column, + String dimensionType, + List userId) { return inject(query, column, dimensionType, false, false, userId); } public static > T inject(T query, - String column, - String dimensionType, - boolean not, - boolean any, - List userId) { - return (T)query.accept(column, createTermType(dimensionType, not, any), userId); + String column, + String dimensionType, + boolean not, + boolean any, + List userId) { + return (T) query.accept(column, createTermType(dimensionType, not, any), userId); } public static String createTermType(String dimensionType, boolean not, boolean any) { @@ -73,7 +73,7 @@ public class DimensionTerm extends AbstractTermFragmentBuilder { fragments.addSql("not "); } fragments - .addSql("exists(select 1 from s_dimension_user d where d.dimension_type_id = ? and d.dimension_id =", columnFullName) + .addSql("exists(select 1 from", getTableName("s_dimension_user", column), "d where d.dimension_type_id = ? and d.dimension_id =", columnFullName) .addParameter(options.get(0)); if (!options.contains("any")) { diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/UserDimensionTerm.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/UserDimensionTerm.java index 7078b197d..b63fc2b4f 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/UserDimensionTerm.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/terms/UserDimensionTerm.java @@ -37,7 +37,7 @@ public class UserDimensionTerm extends AbstractTermFragmentBuilder { fragments.addSql("not"); } - fragments.addSql("exists(select 1 from s_dimension_user d where d.user_id =", columnFullName); + fragments.addSql("exists(select 1 from ",getTableName("s_dimension_user",column)," d where d.user_id =", columnFullName); if (options.size() > 0) { String typeId = options.get(0); diff --git a/pom.xml b/pom.xml index 8854cd5de..c2ad6774a 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 3.2.2 1.6.12 - 4.0.14 + 4.1.0-SNAPSHOT 3.0.2 3.0.2 2.7.0