From 997e1f193cae844e5e352488d226b22b426e3519 Mon Sep 17 00:00:00 2001
From: zxf <13281114856@qq.com>
Date: Thu, 22 Sep 2022 14:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E9=99=84?=
=?UTF-8?q?=E4=BB=B6=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../baseinfo/service/impl/DocBaseinfoServiceImpl.java | 2 +-
.../module/doc/baseinfo/web/DocBaseinfoController.java | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/service/impl/DocBaseinfoServiceImpl.java b/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/service/impl/DocBaseinfoServiceImpl.java
index 39518fe..cb1b402 100644
--- a/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/service/impl/DocBaseinfoServiceImpl.java
+++ b/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/service/impl/DocBaseinfoServiceImpl.java
@@ -348,7 +348,7 @@ public class DocBaseinfoServiceImpl extends AbstractCRUDServiceImpl<DocBaseinfoD
});
//鏌ヨ鏄惁鏈夊閫夋锛�
//鑾峰彇妯℃澘鏂囦欢鍦板潃
- DocTemplateEntity docTemplateEntity = docTemplateService.get(docFormVo.getTemplateId());
+ DocTemplateEntity docTemplateEntity = docTemplateService.get(docFormVo.getTemplateId(),context);
if (!ObjectUtils.isEmpty(docTemplateEntity)) {
String path = filePath + docTemplateEntity.getTemplatePath();
String templateName = FileUtil.getName(path);
diff --git a/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/web/DocBaseinfoController.java b/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/web/DocBaseinfoController.java
index 923e451..fb5115b 100644
--- a/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/web/DocBaseinfoController.java
+++ b/doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/web/DocBaseinfoController.java
@@ -11,6 +11,7 @@ import com.mortals.xhx.module.doc.form.service.DocFormService;
import com.mortals.xhx.module.doc.template.model.vo.DocTemplateVo;
import com.mortals.xhx.module.platform.model.PlatformQuery;
import com.mortals.xhx.module.platform.service.PlatformService;
+import com.sun.xml.internal.bind.v2.TODO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
@@ -95,10 +96,11 @@ public class DocBaseinfoController extends BaseCRUDJsonBodyMappingController<Doc
jsonObject.put("mergeDoc", vals[0]);
jsonObject.put("preview", vals[1]);
jsonObject.put("redirectUrl", redirectUrl);
- docFormVo.setCreateTime(new Date());
- docFormVo.setCreateUserId(getContextUserId(getContext()));
- docFormVo.setCreateUser("");
- docFormService.save(docFormVo, getContext());
+ //todo 淇濆瓨琛ㄥ崟鏁版嵁
+// docFormVo.setCreateTime(new Date());
+// docFormVo.setCreateUserId(getContextUserId(getContext()));
+// docFormVo.setCreateUser("");
+// docFormService.save(docFormVo, getContext());
} catch (Exception e) {
log.error("鍚堟垚琛ㄥ崟寮傚父", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
--
2.24.3