Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FormulaUtil.java

@@ -148,7 +148,7 @@ public class FormulaUtil {
         return result;
     }
 
-    public static void main(String[] args) {
+    /*public static void main(String[] args) {
 
         String formula = "ArchiveFile['id','fileNumber','fileName','dutyUser','fileTime','pageNum',' ']";
         Pattern pattern = Pattern.compile("([^\\[\\],']+)|'([^']*)'"); // 创建正则表达式模式
@@ -164,7 +164,7 @@ public class FormulaUtil {
         }
 
         System.out.println();
-    }
+    }*/
 
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1642,7 +1642,7 @@ public class InformationWriteQueryController extends BladeController {
                             //源表obj对象，文件附件使用
                             addChildNodesTablesOldAll.add(needTab);
                             if (!needTab.getTabFileType().equals(toCopyNodeTab.getTabFileType())) {
-                                toCopyNodeTab.setTabFileType(2); //已上传
+                                toCopyNodeTab.setTabFileType(needTab.getTabFileType()); //已上传
                             }
                             //目标表obj对象，文件附件使用
                             addChildNodesTablesAll.add(toCopyNodeTab);

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

@@ -349,6 +349,7 @@
             wt.sort AS sort,
             case when wt.table_type in(1,9) then 1
                  when wt.table_type in(2,10) then 2
+                 else wt.table_type
                     end as tableType,
             wt.`status` AS isCreateTable ,
             wt.table_owner as tableOwner,

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

@@ -451,10 +451,12 @@
     <select id="selectByNodeTable" resultType="org.springblade.manager.vo.WbsNodeTableVO">
         SELECT wt.p_key_id AS "pKeyId",
                wt.id AS id,
+               wt.wbs_type AS wbsType,
                wt.node_name AS tableName,
                case when wt.table_type in(1,9) then 1
                     when wt.table_type in(2,10) then 2
-                    end as tableType,
+                    else wt.table_type
+                       end as tableType,
                wt.`status` AS isCreateTable,
                wt.table_owner AS tableOwner,
                wt.is_link_table,
@@ -473,6 +475,7 @@
           AND wt.wbs_id = #{wbsId}
           AND wt.project_id = #{projectId}
           AND wt.trial_tab_contract_id is null
+          AND (wt.wbs_type != 2 OR wt.table_type IN (1,2,9,10))
         ORDER BY wt.sort, wt.node_name, wt.create_time
     </select>
     <select id="getByCondition" resultType="org.springblade.manager.entity.WbsTreePrivate">