Merge branch 'test-merge-02' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -2522,15 +2522,17 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
      */
     private List<String> replaceNetworkUrl(List<String> urlList) {
         String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+        //正式环境
         if (!sys_isonline.equals("20")) {
-            for (String url : urlList) {
-                url.replace("https://xinan1.zos.ctyun.cn","http://100.86.2.1");
-            }
+            return urlList.stream()
+                .map(url -> url.replace("https://xinan1.zos.ctyun.cn", "http://100.86.2.1"))
+                .collect(Collectors.toList());
         }
+        //183环境
 //        else {
-//            for (String url : urlList) {
-//                url.replace("http://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com","http://152.168.2.15");
-//            }
+//            return urlList.stream()
+//                .map(url -> url.replace("http://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com", "http://152.168.2.15"))
+//                .collect(Collectors.toList());
 //        }
         return urlList;
     }

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

@@ -1248,7 +1248,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     if (wbsTreeContractByP != null) {
                         //处理文件提名
                         String fileName = this.wbsParamService.createFileTitle(wbsTreeContractByP);
-                        if(wbsTreeContract.getMajorDataType()!=null&&wbsTreeContract.getMajorDataType()==6){
+                        if(wbsTreeContract.getMajorDataType()!=null&&wbsTreeContract.getMajorDataType()==4){
                             String sql1="Select sg_suffix,jl_suffix from m_project_info where id="+wbsTreeContractByP.getProjectId()+" and is_deleted=0";
                             List<ProjectInfo> query = jdbcTemplate.query(sql1, new BeanPropertyRowMapper<>(ProjectInfo.class));
                             if(query.size()>0){