diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml index f4c87dcc..ad059c53 100644 --- a/example/example-app/example-app-cmd-domain/pom.xml +++ b/example/example-app/example-app-cmd-domain/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml index 5a791d3b..efb4b67d 100644 --- a/example/example-app/example-app-cmd-meta/pom.xml +++ b/example/example-app/example-app-cmd-meta/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml index f5ca6c06..7b33144d 100644 --- a/example/example-app/example-app-query/pom.xml +++ b/example/example-app/example-app-query/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-app - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml index b7d1181a..891a7f58 100644 --- a/example/example-app/pom.xml +++ b/example/example-app/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.37 + 3.4.38 ../pom.xml pom diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml index cae0a960..9aba666a 100644 --- a/example/example-domain/example-domain-leave/pom.xml +++ b/example/example-domain/example-domain-leave/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-domain - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml index 7e92e861..c69eb13a 100644 --- a/example/example-domain/example-domain-user/pom.xml +++ b/example/example-domain/example-domain-user/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-domain - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml index f5001cf2..0a4f3395 100644 --- a/example/example-domain/pom.xml +++ b/example/example-domain/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-example - 3.4.37 + 3.4.38 ../pom.xml 4.0.0 diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml index 07a76f1c..15452c29 100644 --- a/example/example-infra/example-infra-flow/pom.xml +++ b/example/example-infra/example-infra-flow/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot example-infra - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml index 5b492faa..916e1086 100644 --- a/example/example-infra/example-infra-jpa/pom.xml +++ b/example/example-infra/example-infra-jpa/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot example-infra - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml index 8ec9fc28..016f549f 100644 --- a/example/example-infra/example-infra-security/pom.xml +++ b/example/example-infra/example-infra-security/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot example-infra - 3.4.37 + 3.4.38 ../pom.xml diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml index d6fcdafc..aba7bf46 100644 --- a/example/example-infra/pom.xml +++ b/example/example-infra/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.37 + 3.4.38 ../pom.xml pom diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml index cae61cc4..8326b8d1 100644 --- a/example/example-interface/pom.xml +++ b/example/example-interface/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-example - 3.4.37 + 3.4.38 example-interface diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml index 34d12288..08f73ef9 100644 --- a/example/example-server/pom.xml +++ b/example/example-server/pom.xml @@ -5,7 +5,7 @@ springboot-example com.codingapi.springboot - 3.4.37 + 3.4.38 4.0.0 diff --git a/example/pom.xml b/example/pom.xml index 2d14b745..2b6585ec 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -19,7 +19,7 @@ springboot-example - 3.4.37 + 3.4.38 springboot-example springboot-example project for Spring Boot diff --git a/pom.xml b/pom.xml index 42b5cb72..1de7bbaf 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.codingapi.springboot springboot-parent - 3.4.37 + 3.4.38 https://github.com/codingapi/springboot-framewrok springboot-parent diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml index dc7ad379..93e52768 100644 --- a/springboot-starter-data-authorization/pom.xml +++ b/springboot-starter-data-authorization/pom.xml @@ -6,7 +6,7 @@ com.codingapi.springboot springboot-parent - 3.4.37 + 3.4.38 springboot-starter-data-authorization diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/Condition.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/Condition.java index b4c39bd1..c743b91a 100644 --- a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/Condition.java +++ b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/Condition.java @@ -19,13 +19,18 @@ public Condition() { this.conditionList = new ArrayList<>(); } - public void addDynamicSQL(IConditionSQL dynamicSQL){ + public Condition(String condition) { + this.conditionList = new ArrayList<>(); + this.addConditionSQL(new WhereConditionSQL(condition)); + } + + public void addConditionSQL(IConditionSQL dynamicSQL){ this.conditionList.add(dynamicSQL); } public static Condition customCondition(String condition) { Condition dynamicSQLContent = new Condition(); - dynamicSQLContent.addDynamicSQL(new WhereConditionSQL(condition)); + dynamicSQLContent.addConditionSQL(new WhereConditionSQL(condition)); return dynamicSQLContent; } diff --git a/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java b/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java index a455b439..9a322037 100644 --- a/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java +++ b/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java @@ -426,8 +426,8 @@ void test6() throws Exception{ public Condition rowAuthorization(String tableName, String tableAlias) { String conditionTemplate = "%s.id > -100 "; Condition condition = new Condition(); - condition.addDynamicSQL(new WhereConditionSQL(conditionTemplate, tableAlias)); - condition.addDynamicSQL(new JoinConditionSQL( + condition.addConditionSQL(new WhereConditionSQL(conditionTemplate, tableAlias)); + condition.addConditionSQL(new JoinConditionSQL( JoinConditionSQL.Type.INNER, "t_unit", "u", diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml index 87881302..e0db14b8 100644 --- a/springboot-starter-data-fast/pom.xml +++ b/springboot-starter-data-fast/pom.xml @@ -5,7 +5,7 @@ springboot-parent com.codingapi.springboot - 3.4.37 + 3.4.38 4.0.0 diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml index 3fec914f..ad422472 100644 --- a/springboot-starter-flow/pom.xml +++ b/springboot-starter-flow/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.4.37 + 3.4.38 springboot-starter-flow diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml index a9d789b4..d8f68a7f 100644 --- a/springboot-starter-security/pom.xml +++ b/springboot-starter-security/pom.xml @@ -6,7 +6,7 @@ springboot-parent com.codingapi.springboot - 3.4.37 + 3.4.38 springboot-starter-security diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml index c02e712a..7132b9b1 100644 --- a/springboot-starter/pom.xml +++ b/springboot-starter/pom.xml @@ -5,7 +5,7 @@ com.codingapi.springboot springboot-parent - 3.4.37 + 3.4.38 springboot-starter