bug

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -702,51 +702,52 @@
 
     <select id="selectWbsTreeTrialTabList" resultType="org.springblade.manager.vo.WbsTreePrivateVO4">
         SELECT
-        p_key_id,
-        node_name,
-        node_type,
-        is_link_table,
-        is_tab_pdf,
-        is_buss_show,
-        tab_file_type,
-        wbs_id,
-        wbs_type,
-        html_url,
-        excel_id,
-        project_id,
-        type,
-        case when table_type = 9 then 1
-        when table_type = 10 then 2
-        end as tableType,
-        table_owner,
-        init_table_name,
-        init_table_id,
-        fill_rate,
-        pdf_url,
-        sort,
-        create_time,
-        (CASE WHEN locate('__',node_name) > 0 THEN 1 ELSE 0 END) AS isCopyTab
+            p_key_id,
+            node_name,
+            node_type,
+            case when table_type in(1,9) then 1
+                 when table_type in(2,10) then 2
+                 else table_type
+                 end as tableType,
+            table_owner,
+            is_link_table,
+            is_tab_pdf,
+            is_buss_show,
+            tab_file_type,
+            wbs_id,
+            wbs_type,
+            html_url,
+            excel_id,
+            project_id,
+            type,
+            init_table_name,
+            init_table_id,
+            fill_rate,
+            pdf_url,
+            sort,
+            create_time,
+            (CASE WHEN locate('__',node_name) > 0 THEN 1 ELSE 0 END) AS isCopyTab
         FROM
-        m_wbs_tree_private
+            m_wbs_tree_private
         WHERE project_id = #{projectId}
-        AND wbs_id = #{wbsId}
-        AND parent_id = #{parentId}
-        AND table_type = #{tableType}
-        AND type = 2
-        AND status = 1
-        AND is_deleted = 0
-        /*试验所属方=7*/
-        AND table_owner = 7
+            AND wbs_id = #{wbsId}
+            AND parent_id = #{parentId}
+            AND table_type in (${tableType})
+            AND type = 2
+            AND status = 1
+            AND is_deleted = 0
+            /*试验所属方=7*/
+            AND table_owner = 7
         /*解决不同合同段中复制表问题*/
         <if test="contractId == null">
             -- 后管加载原始表
-            and trial_tab_contract_id is null
+            AND trial_tab_contract_id is null
         </if>
         <if test="contractId != null and contractId != ''">
             -- 客户端加载当前合同段表+原始表
-            and (trial_tab_contract_id is null OR (trial_tab_contract_id = #{contractId}))
+            AND (trial_tab_contract_id is null OR (trial_tab_contract_id = #{contractId}))
         </if>
-        ORDER BY sort,node_name,create_time
+            ORDER BY sort,node_name,create_time
     </select>
 
     <select id="selectTabInfoAll" resultType="org.springblade.manager.entity.TableInfo">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -1794,9 +1794,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         if (StringUtils.isNotEmpty(roleAndTabOwner)) {
             //试验tabOwner=7，默认加载全部tabOwner=7的表
             if ("1".equals(tableType)) {
-                tableType = "9"; //记录表
+                tableType = "1,9"; //记录表
             } else if ("2".equals(tableType)) {
-                tableType = "10";  //报告单
+                tableType = "2,10";  //报告单
             }
             return baseMapper.selectWbsTreeTrialTabList(tableType, wbsTreePrivate.getProjectId(), wbsTreePrivate.getWbsId(), wbsTreePrivate.getId(), contractId);
         } else {