update 3.3.56

data authorization support union all sql

Author: xlorne

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.55</version>
+    <version>3.3.56</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.55</version>
+    <version>3.3.56</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/enhancer/DataPermissionSQLEnhancer.java

@@ -8,12 +8,10 @@
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.select.FromItem;
-import net.sf.jsqlparser.statement.select.Join;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.*;
 
 import java.sql.SQLException;
+import java.util.List;
 
 /**
  * 数据权限 SQL 增强器
@@ -45,8 +43,7 @@ public String getNewSQL() throws SQLException {
             if (statement instanceof Select) {
                 tableColumnAliasHolder.holderAlias();
                 Select select = (Select) statement;
-                PlainSelect plainSelect = select.getPlainSelect();
-                this.enhanceDataPermissionInSelect(plainSelect);
+                this.deepMatch(select);
                 return statement.toString();
             }
         } catch (Exception e) {
@@ -55,6 +52,21 @@ public String getNewSQL() throws SQLException {
         return sql;
     }
 
+
+    private void deepMatch(Select select) throws Exception {
+        if (select instanceof PlainSelect) {
+            PlainSelect plainSelect = select.getPlainSelect();
+            this.enhanceDataPermissionInSelect(plainSelect);
+        }
+        if (select instanceof SetOperationList) {
+            SetOperationList setOperationList = select.getSetOperationList();
+            List<Select> selectList = setOperationList.getSelects();
+            for (Select selectItem : selectList) {
+                this.deepMatch(selectItem.getPlainSelect());
+            }
+        }
+    }
+
     public TableColumnAliasContext getTableAlias() {
         return tableColumnAliasHolder.getAliasContext();
     }

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/enhancer/TableColumnAliasHolder.java

@@ -29,9 +29,22 @@ public TableColumnAliasHolder(Statement statement) {
      */
     public void holderAlias() {
         Select select = (Select) statement;
-        PlainSelect plainSelect = select.getPlainSelect();
-        this.searchSubSelect(null, plainSelect);
-        aliasContext.columnKeyToMap();
+        this.deepSearch(select);
+    }
+
+
+    private void deepSearch(Select select) {
+        if (select instanceof PlainSelect) {
+            PlainSelect plainSelect = select.getPlainSelect();
+            this.searchSubSelect(null, plainSelect);
+            aliasContext.columnKeyToMap();
+        } else if (select instanceof SetOperationList) {
+            SetOperationList setOperationList = select.getSetOperationList();
+            List<Select> selectList = setOperationList.getSelects();
+            for (Select selectItem : selectList) {
+                this.deepSearch(selectItem);
+            }
+        }
     }
 
 

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

@@ -195,4 +195,30 @@ void test7() throws Exception{
         System.out.println(builder.getNewSQL());
         System.out.println(builder.getTableAlias());;
     }
+
+    @Test
+    @Order(8)
+    void test8() throws Exception{
+        String sql = "select ade1_0.id,ade1_0.ba_dept_name,ade1_0.ba_org_shortname,ade1_0.ba_dept_code,ade1_0.ba_code,ade1_0.ba_dept_property_code,ade1_0.ba_parent_type,ade1_0.ba_real_super_org_id,ade1_0.ba_org_is_avoidance_dept,ade1_0.ba_real_super_org_id,ade1_0.ba_super_org_name " +
+                "from ba04_administrative_department ade1_0 where ade1_0.ba_parent_type=0" +
+                " union all select ade2_0.id,ade2_0.ba_dept_name,ade2_0.ba_org_shortname,ade2_0.ba_dept_code,ade2_0.ba_code,ade2_0.ba_dept_property_code,ade2_0.ba_parent_type,ade2_0.ba_real_super_org_id,ade2_0.ba_org_is_avoidance_dept,ade3_0.ba_real_super_org_id,ade3_0.ba_super_org_name" +
+                " from ba04_administrative_department ade2_0 left join ba04_administrative_department ade3_0 on ade2_0.ba_real_super_org_id=ade3_0.id " +
+                "where ade2_0.ba_real_super_org_id=1";
+
+
+
+        RowHandler rowHandler = (subSql, tableName, tableAlias) -> {
+            if (tableName.equalsIgnoreCase("ba04_administrative_department")) {
+                String conditionTemplate = "%s.id < 100 ";
+                return Condition.formatCondition(conditionTemplate, tableAlias);
+            }
+            return null;
+        };
+        DataPermissionSQLEnhancer builder = new DataPermissionSQLEnhancer(sql, rowHandler);
+        String newSQL = builder.getNewSQL();
+        System.out.println(newSQL);
+        System.out.println(builder.getTableAlias());
+        assertEquals("SELECT ade1_0.id, ade1_0.ba_dept_name, ade1_0.ba_org_shortname, ade1_0.ba_dept_code, ade1_0.ba_code, ade1_0.ba_dept_property_code, ade1_0.ba_parent_type, ade1_0.ba_real_super_org_id, ade1_0.ba_org_is_avoidance_dept, ade1_0.ba_real_super_org_id, ade1_0.ba_super_org_name FROM ba04_administrative_department ade1_0 WHERE ade1_0.id < 100 AND ade1_0.ba_parent_type = 0 " +
+                "UNION ALL SELECT ade2_0.id, ade2_0.ba_dept_name, ade2_0.ba_org_shortname, ade2_0.ba_dept_code, ade2_0.ba_code, ade2_0.ba_dept_property_code, ade2_0.ba_parent_type, ade2_0.ba_real_super_org_id, ade2_0.ba_org_is_avoidance_dept, ade3_0.ba_real_super_org_id, ade3_0.ba_super_org_name FROM ba04_administrative_department ade2_0 LEFT JOIN ba04_administrative_department ade3_0 ON ade2_0.ba_real_super_org_id = ade3_0.id WHERE ade3_0.id < 100 AND ade2_0.id < 100 AND ade2_0.ba_real_super_org_id = 1", newSQL);
+    }
 }

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.55</version>
+        <version>3.3.56</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
 ------------------------------------------------------
-CodingApi SpringBoot-Starter 3.3.55
+CodingApi SpringBoot-Starter 3.3.56
 springboot version (${spring-boot.version})
 ------------------------------------------------------