表单生产bug修改

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -298,6 +298,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Override
     public String mergeFormToDoc(MatterDatumEntity docFormVo, Context context) {
+        String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         //转换表单参数为map集合
         ObjectMapper mapper = new ObjectMapper();
         ConfigureBuilder builder = Configure.builder();
@@ -353,7 +354,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             //获取模板文件地址
             MatterDatumEntity docTemplateEntity = this.get(docFormVo.getId(),context);
             if (!ObjectUtils.isEmpty(docTemplateEntity)) {
-                String path = filePath + docTemplateEntity.getTemplatePath();
+                String path = rootPath + docTemplateEntity.getTemplatePath();
                 String templateName = FileUtil.getName(path);
                 Configure config = builder.build();
                 XWPFTemplate template = null;
@@ -367,7 +368,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                             ContentType.APPLICATION_OCTET_STREAM.toString(), byteArrayOutputStream.toByteArray());
                     String mergedocPath = uploadService.saveFileUpload(multipartFile, "/mergedoc", context.getUser());
                     log.info("mergedocPath:" + mergedocPath);
-                    String mergedoc = this.filePath + mergedocPath;
+                    String mergedoc = rootPath + mergedocPath;
                     //转换预览图片
                     String fileName = RandomUtil.randomNumbers(12) + ".jpg";
                     String preView = this.filePath + "/preview/" + fileName;