Browse Source

添加元素库隐藏弹出框

cr 1 month ago
parent
commit
40637a8573

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

@@ -55,8 +55,7 @@
         dept.parent_id,
         dept.name,
         dept.file_type,
-        dept.tab_type AS "tabType",
-        dept.tab_id,
+        dept.tab_type,
         info.table_owner as tableOwner,
         (
         SELECT
@@ -68,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
         <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>