From 3aae81075a18a11d6b605c7583eb03b75366b466 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 四月 2024 00:08:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
index 086aeb0..e2aaccc 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
@@ -8,6 +8,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
import java.util.Date;
import java.util.List;
@@ -57,7 +58,9 @@
*/
public BtmTypeAttribute copyBtmTypeAttributeDTO2Entity(BtmTypeLinkAttributesDTO dto, String btmTypeOid, String creator, Date now){
BtmTypeAttribute entity = Objects.requireNonNull(BeanUtil.copy(dto, BtmTypeAttribute.class));
- entity.setOid(VciBaseUtil.getPk());
+ if (StringUtil.isBlank(entity.getOid())) {
+ entity.setOid(VciBaseUtil.getPk());
+ }
entity.setBtmName(BtmTypeConstant.BTM_TYPE_ATTRIBUTE);
entity.setOwner(creator);
entity.setCreator(creator);
@@ -65,6 +68,8 @@
entity.setLastModifier(creator);
entity.setLastModifyTime(now);
entity.setTs(now);
+ entity.setPrecisionLength(0);
+ entity.setScaleLength(0);
entity.setPkBtmType(btmTypeOid);
// 鍦ㄨ繖杩涜閫氱敤瀛楁澶勭悊
return entity;
--
Gitblit v1.9.3