Преглед на файлове

优化表名获取逻辑

zhouhao преди 2 години
родител
ревизия
87b921528f

+ 10 - 10
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")) {

+ 1 - 1
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);

+ 1 - 1
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>