Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java

@@ -26,7 +26,7 @@ public class AppStartSystemInit implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-        LOGGER.info(" Start Core Init Thread ");
+        LOGGER.info("IMPP-Core加载开始...");
         systemInitService.loadAll();
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java

@@ -82,6 +82,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
     @ApiOperation(value = "删除打印模板",notes = "删除打印模板")
     public void deleteSysLabelTemplateById(Long id) {
         sysLabelTemplateRDao.deleteById(id);
+        sysLabelTemplateParamRDao.deleteByProperty("templateId", id);
     }
 
     @Override
@@ -113,8 +114,10 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
         // 更新打印模板
         sysLabelTemplateRDao.update(sysLabelTemplate);
 
+        int effect = sysLabelTemplateParamRDao.deleteByProperty("templateId", sysLabelTemplate.getId());
+
         // 判断模板参数是否存在，存在就进行数据操作
-        if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack())) {
+        if (StringUtils.isNotBlank(sysLabelTemplate.getParamsPack()) && effect > 1) {
             // 更新打印模板参数
             SysLabelTemplateParam templateParam;
             String[] paramArr = sysLabelTemplate.getParamsPack().trim().split(",");
@@ -124,8 +127,8 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
                 templateParam.setTemplateParam(paramItem);
                 templateParam.setTemplateId(sysLabelTemplate.getId());
                 templateParam.setTemplateParamText(paramItem);
-                ConvertBean.serviceModelUpdate(templateParam, AuthUtil.getSessionUser().getUserName());
+                ConvertBean.serviceModelInitialize(templateParam, AuthUtil.getSessionUser().getUserName());
-                sysLabelTemplateParamRDao.update(templateParam);
+                sysLabelTemplateParamRDao.insert(templateParam);
             }
         }
     }