fix fromItem.getAlias().getName() null point bug

Author: xlorne

pom.xml

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

springboot-starter-data-authorization/pom.xml

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

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

@@ -64,7 +64,7 @@ private void searchSubSelect(String parent, PlainSelect plainSelect) {
         if (fromItem instanceof Select) {
             PlainSelect subPlainSelect = ((Select) fromItem).getPlainSelect();
             this.appendColumnAlias(parent, null, plainSelect.getSelectItems());
-            parent = fromItem.getAlias().getName();
+            parent = fromItem.getAlias()!=null?fromItem.getAlias().getName():null;
             this.searchSubSelect(parent, subPlainSelect);
         }
 
@@ -75,7 +75,7 @@ private void searchSubSelect(String parent, PlainSelect plainSelect) {
                     FromItem currentItem = join.getRightItem();
                     PlainSelect subPlainSelect = ((Select) currentItem).getPlainSelect();
                     this.appendColumnAlias(parent, null, plainSelect.getSelectItems());
-                    parent = currentItem.getAlias().getName();
+                    parent = currentItem.getAlias()!=null?currentItem.getAlias().getName():null;
                     this.searchSubSelect(parent, subPlainSelect);
                 }
                 if (join.getRightItem() instanceof Table) {
@@ -125,4 +125,4 @@ private void appendColumnAlias(String parent, String tableName, List<SelectItem<
         }
     }
 
-}
+}

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

@@ -196,7 +196,6 @@ void test7() throws Exception{
         System.out.println(builder.getTableAlias());;
     }
 
-
     @Test
     @Order(8)
     void test8() throws Exception{
@@ -222,4 +221,46 @@ void test8() throws Exception{
         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);
     }
-}
+
+
+    @Test
+    @Order(9)
+    void test9() throws Exception{
+        String sql = "select cd.id,cd.name,cd.parent_id from depart cd join depart pd on cd.id = pd.parent_id where cd.id = ?";
+
+        RowHandler rowHandler = (subSql, tableName, tableAlias) -> {
+            if (tableName.equalsIgnoreCase("depart") && tableAlias.equalsIgnoreCase("cd")) {
+                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().getTableAlias());
+        assertEquals("SELECT cd.id, cd.name, cd.parent_id FROM depart cd JOIN depart pd ON cd.id = pd.parent_id WHERE cd.id = 100 AND cd.id = ?",newSQL);
+    }
+
+
+
+    @Test
+    @Order(10)
+    void test10() throws Exception{
+        String sql = "SELECT * FROM ( SELECT TMP.*, ROWNUM ROW_ID FROM ( SELECT t.id,t.parent_id,t.type,t.target_id,t.system_code,t.full_name,t.short_name,t.system_short_name,t.full_name_tair,t.short_name_tair,t.system_short_name_tair,t.tree_sort,t.sys_creator_id,t.sys_updater_id,t.sys_create_time,t.sys_update_time,t.sys_deleted,t.sys_enabled,parent.short_name AS parentName,parent.type AS parentType,if(parent.type=0,'单位','部门') AS parentTypeText FROM sys_u_organization t LEFT JOIN sys_u_organization parent ON (parent.id = t.parent_id AND parent.sys_deleted=0) LEFT JOIN sys_u_company t2 ON (t2.organization_id = t.id AND t2.sys_deleted=0) WHERE t.sys_deleted=0 AND (t.id <> ? AND t.type = ? AND t.system_code LIKE ?) ORDER BY t.tree_sort ASC,t.tree_sort ASC ) TMP WHERE ROWNUM <=?)  WHERE ROW_ID > ?";
+
+        RowHandler rowHandler = (subSql, tableName, tableAlias) -> {
+            if (tableName.equalsIgnoreCase("sys_u_organization")) {
+                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().getTableAlias());
+        assertEquals("SELECT * FROM (SELECT TMP.*, ROWNUM ROW_ID FROM (SELECT t.id, t.parent_id, t.type, t.target_id, t.system_code, t.full_name, t.short_name, t.system_short_name, t.full_name_tair, t.short_name_tair, t.system_short_name_tair, t.tree_sort, t.sys_creator_id, t.sys_updater_id, t.sys_create_time, t.sys_update_time, t.sys_deleted, t.sys_enabled, parent.short_name AS parentName, parent.type AS parentType, if(parent.type = 0, '单位', '部门') AS parentTypeText FROM sys_u_organization t LEFT JOIN sys_u_organization parent ON (parent.id = t.parent_id AND parent.sys_deleted = 0) LEFT JOIN sys_u_company t2 ON (t2.organization_id = t.id AND t2.sys_deleted = 0) WHERE parent.id < 100 AND t.id < 100 AND t.sys_deleted = 0 AND (t.id <> ? AND t.type = ? AND t.system_code LIKE ?) ORDER BY t.tree_sort ASC, t.tree_sort ASC) TMP WHERE ROWNUM <= ?) WHERE ROW_ID > ?", newSQL);
+    }
+
+}

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.34</version>
+        <version>2.10.35</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>2.10.34</version>
+        <version>2.10.35</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>2.10.34</version>
+        <version>2.10.35</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>2.10.34</version>
+        <version>2.10.35</version>
     </parent>
     <artifactId>springboot-starter</artifactId>