From da490cef12c409ad3bbf7ca03bbb18295e1ab3f5 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 22 Nov 2019 17:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=20bug=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/controller/busi/SysLabelTemplateController.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
index cf42332..ac8a80d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLabelTemplateService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.BeanCopyTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -21,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -124,15 +126,20 @@ public class SysLabelTemplateController extends CoreBaseController {
 
             // 条件验证
             ValidatorBean.beginValid(sysLabelTemplate)
+                    .notNull("id", sysLabelTemplate.getId())
                     .notNull("templateCode", sysLabelTemplate.getTemplateCode())
                     .notNull("templateName", sysLabelTemplate.getTemplateName())
                     .notNull("paramsPack", sysLabelTemplate.getParamsPack())
                     .notNull("templateContent", sysLabelTemplate.getTemplateContent());
 
+            SysLabelTemplate template = sysLabelTemplateService.getSysLabelTemplateById(sysLabelTemplate.getId());
+            ValidatorBean.checkNotNull(template,"不存在的模板信息");
+
             //添加初始化
             ConvertBean.modelUpdate(sysLabelTemplate, user);
+            BeanCopyTool.beanCopy(sysLabelTemplate,template);
 
-            sysLabelTemplateService.updateSysLabelTemplate(sysLabelTemplate);
+            sysLabelTemplateService.updateSysLabelTemplate(template);
             return  ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);