From fefddc77b2e240d5754abf15f5e3e91e86d360fe Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 04 十二月 2023 16:09:34 +0800 Subject: [PATCH] 集团码导入功能开发 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java | 5 ++++- 1 files changed, 4 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..391dd47 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); -- Gitblit v1.9.3