From 87b921528f794d5e7994ed8fdcf8331cbbc7c8bf Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Wed, 28 Sep 2022 18:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=90=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../defaults/service/terms/DimensionTerm.java | 20 +++++++++----------
 .../service/terms/UserDimensionTerm.java      |  2 +-
 pom.xml                                       |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

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 extends Conditional<?>> T inject(T query,
-                                                   String column,
-                                                   String dimensionType,
-                                                   List<String> userId) {
+                                                      String column,
+                                                      String dimensionType,
+                                                      List<String> userId) {
         return inject(query, column, dimensionType, false, false, userId);
     }
 
     public static <T extends Conditional<?>> T inject(T query,
-                                                   String column,
-                                                   String dimensionType,
-                                                   boolean not,
-                                                   boolean any,
-                                                   List<String> userId) {
-        return (T)query.accept(column, createTermType(dimensionType, not, any), userId);
+                                                      String column,
+                                                      String dimensionType,
+                                                      boolean not,
+                                                      boolean any,
+                                                      List<String> 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 @@
         <cglib.version>3.2.2</cglib.version>
         <aspectj.version>1.6.12</aspectj.version>
 
-        <hsweb.ezorm.version>4.0.14</hsweb.ezorm.version>
+        <hsweb.ezorm.version>4.1.0-SNAPSHOT</hsweb.ezorm.version>
         <hsweb.utils.version>3.0.2</hsweb.utils.version>
         <hsweb.expands.version>3.0.2</hsweb.expands.version>
         <swagger.version>2.7.0</swagger.version>