From ee7d7c29b8d95f0adab3bd9d93fdb1af51565a2d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 03 八月 2023 20:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index 80894c7..f48f222 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -507,13 +507,13 @@
codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
codeCls_template_insert.setLastR(String.valueOf(1));
- codeCls_template_insert.setFirstR(String.valueOf(1));
+ codeCls_template_insert.setFirstR(String.valueOf(0));
codeCls_template_insert.setFirstV(String.valueOf(1));
codeCls_template_insert.setLastV(String.valueOf(1));
- codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeCls_template_insert.setCreateTime(new Date());
codeCls_template_insert.setTs(new Date());
- codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeCls_template_insert.setLastModifyTime(new Date());
codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
@@ -531,9 +531,13 @@
codeCls_template_insert.setId(codeCls_template.getId());
codeCls_template_insert.setName(codeCls_template.getName());
codeCls_template_insert.setDescription(codeCls_template.getDescription());
- codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
+ codeCls_template_insert.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
int insertCount = baseMapper.insert(codeCls_template_insert);
+ codeCls_template.setLastR("0");
+ codeCls_template.setLastModifyTime(new Date());
+ codeCls_template.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ baseMapper.updateById(codeCls_template);
//鍗囩増杩囧悗鐨勬ā鏉縪id
String templateNewOid = codeCls_template_insert.getOid();
--
Gitblit v1.9.3