Procházet zdrojové kódy

添加元素库隐藏弹出框

cr před 1 měsícem
rodič
revize
18bac7e279

+ 3 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ExceTabTreVO.java

@@ -51,6 +51,9 @@ public class ExceTabTreVO extends ExcelTab implements INode<ExceTabTreVO> {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
+
+    private Integer tableOwner;
+
     /**
      * 子孙节点
      */

+ 8 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ExcelTabMapper.xml

@@ -55,8 +55,8 @@
         dept.parent_id,
         dept.name,
         dept.file_type,
-        dept.tab_type AS "tabType",
-        dept.is_deleted,
+        dept.tab_type,
+        info.table_owner as tableOwner,
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -67,18 +67,20 @@
         ) AS "has_children"
         FROM
         m_excel_tab dept
+        LEFT JOIN
+        m_table_info info ON dept.tab_id = info.id
         WHERE
-        (dept.is_deleted = 0 or dept.is_deleted = 3)
+        dept.is_deleted = 0
         <if test="param3!=null and param3!=''">
             AND dept.parent_id = #{param3}
         </if>
         <if test="param2!=null and param2!=''">
-            and dept.alias like concat(concat('%', #{param2}),'%')
+            AND dept.alias like concat(concat('%', #{param2}),'%')
         </if>
         <if test="param1!=null and param1!=''">
-            and dept.tenant_id = #{param1}
+            AND dept.tenant_id = #{param1}
         </if>
-        ORDER BY dept.sort,dept.create_time
+        ORDER BY dept.sort, dept.create_time
     </select>