Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/CustomAddContractNodeDTO.java

@@ -48,4 +48,7 @@ public class CustomAddContractNodeDTO implements Serializable {
     @ApiModelProperty(value = "新加的自定义划分编号")
     private String newPartitionCode;
 
+    @ApiModelProperty(value = "模板类型 1模版节点 2底层节点")
+    private Integer templateType;
+
 }

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

@@ -4380,26 +4380,28 @@ public R<Object> customAddContractNode(@RequestBody CustomAddContractNodeDTO dto
     }
     WbsTreeContract parentNode = wbsTreeContractClient.getContractNodeByPrimaryKeyId(dto.getPrimaryKeyId());
     if (parentNode != null) {
-        Integer targetType;//当前节点类型
-        Integer sourceType;//父节点类型
-        if(parentNode.getNodeType()!=1){
-            sourceType=parentNode.getNodeType()+1;
-        }else {
-            sourceType=parentNode.getNodeType();
-        }
-        if(parentNode.getNodeType()==18){
-            sourceType=2;
-        }
-        if(dto.getNodeType()!=1){
-            targetType=dto.getNodeType()+1;
-        }else {
-            targetType=dto.getNodeType();
-        }
-        if(dto.getNodeType()==18){
-            targetType=2;
-        }
-        if(sourceType>=targetType){
-            throw new ServiceException("当前新增选择的节点类型不能大于或等于父级节点类型");
+        if(dto.getTemplateType()!=null&&dto.getTemplateType()==2){
+            Integer targetType;//当前节点类型
+            Integer sourceType;//父节点类型
+            if(parentNode.getNodeType()!=1){
+                sourceType=parentNode.getNodeType()+1;
+            }else {
+                sourceType=parentNode.getNodeType();
+            }
+            if(parentNode.getNodeType()==18){
+                sourceType=2;
+            }
+            if(dto.getNodeType()!=1){
+                targetType=dto.getNodeType()+1;
+            }else {
+                targetType=dto.getNodeType();
+            }
+            if(dto.getNodeType()==18){
+                targetType=2;
+            }
+            if(sourceType>=targetType){
+                throw new ServiceException("当前新增选择的节点类型不能大于或等于父级节点类型");
+            }
         }
         WbsTreeContract obj = new WbsTreeContract();
         obj.setPKeyId(SnowFlakeUtil.getId());

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -538,16 +538,18 @@ public class FileUtils {
                 if(SystemUtils.isWindows() || SystemUtils.isMacOs()){
                     file_path2 = file_path;
                 }else{
-                    return fileUrl;
+                    return sys_file_net_url + fileUrl.replaceAll("//", "/").replaceAll(file_path2, "");
                 }
             }else{
                 return fileUrl;
             }
         } else {
-            file_path2 = file_path;
+            file_path = file_path2;
         }
-
-        String path = sys_file_net_url + fileUrl.replaceAll("//", "/").replaceAll(file_path2, "");
+        String s1 = fileUrl.replaceAll("//", "/").replace("///","/");
+        file_path= file_path.replaceAll("//","/").replaceAll("///","/");
+        String s2= s1.replaceAll(file_path, "");
+        String path = sys_file_net_url + s2;
         return path;
     }