Jelajahi Sumber

文件提名规则默认配置

yangyj 11 bulan lalu
induk
melakukan
2a880bd3c5

+ 3 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsParamServiceImpl.java

@@ -66,10 +66,11 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
                     if (Func.isNotEmpty(wp)) {
                         return CustomFunction.tree(nodes.stream().map(w->StringUtils.isNotEmpty(w.getFullName())?w.getFullName():w.getNodeName()).collect(Collectors.toList()), wp.getV()).toString();
                     }else{
-                        System.out.println(wtp.getNodeName()+"找不到文件题名配置");
+                        return wtp.getNodeName()+"找不到文件题名配置";
                     }
                 }else{
-                    return "找不到项目配置信息";
+                    return nodes.stream().filter(e->e.getNodeType()!=null&&(e.getNodeType().equals(2)||e.getNodeType().equals(4)||e.getNodeType().equals(6))).map(w->StringUtils.isNotEmpty(w.getFullName())?w.getFullName():w.getNodeName()).map(s->s.replaceAll("[\\s\\n\\t]+","")).collect(Collectors.joining());
+                   /* return "找不到项目配置信息";*/
                 }
 
             }else{
@@ -78,7 +79,6 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
         }else {
             return "找不到节点";
         }
-        return NOT_SET;
     }
 
     public WbsTreePrivate getOriginWtp(Long pkeyId) {