Skip to content

Commit 45580ba

Browse files
committed
add IConditionSQLHandler
1 parent 7a5acb6 commit 45580ba

8 files changed

Lines changed: 15 additions & 10 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<groupId>com.codingapi.springboot</groupId>
1717
<artifactId>springboot-parent</artifactId>
18-
<version>2.10.37</version>
18+
<version>2.10.38</version>
1919

2020
<url>https://github.com/codingapi/springboot-framewrok</url>
2121
<name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.37</version>
9+
<version>2.10.38</version>
1010
</parent>
1111

1212
<name>springboot-starter-data-authorization</name>

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/handler/Condition.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,18 @@ public Condition() {
1919
this.conditionList = new ArrayList<>();
2020
}
2121

22-
public void addDynamicSQL(IConditionSQL dynamicSQL){
22+
public Condition(String condition) {
23+
this.conditionList = new ArrayList<>();
24+
this.addConditionSQL(new WhereConditionSQL(condition));
25+
}
26+
27+
public void addConditionSQL(IConditionSQL dynamicSQL){
2328
this.conditionList.add(dynamicSQL);
2429
}
2530

2631
public static Condition customCondition(String condition) {
2732
Condition dynamicSQLContent = new Condition();
28-
dynamicSQLContent.addDynamicSQL(new WhereConditionSQL(condition));
33+
dynamicSQLContent.addConditionSQL(new WhereConditionSQL(condition));
2934
return dynamicSQLContent;
3035
}
3136

springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ void test6() throws Exception{
424424
public Condition rowAuthorization(String tableName, String tableAlias) {
425425
String conditionTemplate = "%s.id > -100 ";
426426
Condition condition = new Condition();
427-
condition.addDynamicSQL(new WhereConditionSQL(conditionTemplate, tableAlias));
428-
condition.addDynamicSQL(new JoinConditionSQL(
427+
condition.addConditionSQL(new WhereConditionSQL(conditionTemplate, tableAlias));
428+
condition.addConditionSQL(new JoinConditionSQL(
429429
JoinConditionSQL.Type.INNER,
430430
"t_unit",
431431
"u",

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>2.10.37</version>
8+
<version>2.10.38</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.37</version>
9+
<version>2.10.38</version>
1010
</parent>
1111

1212
<name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>2.10.37</version>
9+
<version>2.10.38</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>2.10.37</version>
8+
<version>2.10.38</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

0 commit comments

Comments
 (0)