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

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -1694,7 +1694,7 @@ public class CustomFunction {
             Integer type = RandomNumberHolder.getRandomTemplateType();
             if(type==null||type==1){
                 for (Integer i : index) {
-                    if (i < nodes.size()) {
+                    if (i >= nodes.size()) {
                         continue;
                     }
                     boolean isExist = false;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -548,14 +548,19 @@ public class WbsTreeContractController extends BladeController {
         WbsTreeContract node = wbsTreeContractServiceImpl.getById(nodeId);
         List<WbsTreeContract> ancestorsList = wbsTreeContractServiceImpl.getAncestorsList(node.getAncestorsPId());
         for (WbsTreeContract ancestor : ancestorsList) {
-            if (2 == ancestor.getNodeType()) {
+            if (18 == ancestor.getNodeType()) {
                 excelName.append(ancestor.getNodeName());
-            } else if (4 == ancestor.getNodeType()) {
-                excelName.append("-" + ancestor.getNodeName());
+            } else if (2 == ancestor.getNodeType()) {
+                excelName.append("》" + ancestor.getNodeName());
+            } else if (3 == ancestor.getNodeType()) {
+                excelName.append("》" + ancestor.getNodeName());
+            }else if (4 == ancestor.getNodeType()) {
+                excelName.append("》" + ancestor.getNodeName());
+            } else if (5 == ancestor.getNodeType()) {
+                excelName.append("》" + ancestor.getNodeName());
             }
         }
-        excelName.append("-" + node.getNodeName());
-
+        excelName.append("》" + node.getNodeName());
         // 创建主工作簿（用于合并多sheet）
         XSSFWorkbook mainWorkbook = new XSSFWorkbook();
 
@@ -614,9 +619,10 @@ public class WbsTreeContractController extends BladeController {
             if (mainWorkbook.getNumberOfSheets() == 0) {
                 throw new ServiceException("所有表单均无法生成有效Excel内容");
             }
-
             String originalFileName = excelName + ".xlsx";
-
+            if(originalFileName.startsWith("》")){
+                originalFileName=originalFileName.substring(1);
+            }
             try {
                 // 1. 先编码所有字符
                 String fullyEncoded = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8.name());