From 298b4505c17f70eb6359d2e51fc3d0e0144c00db Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 01 八月 2023 17:29:33 +0800
Subject: [PATCH] 添加达梦VARCHAR2的反签；修改元数据id的最大值
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml | 6 +-----
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 9 +++++++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index f248f5a..1a5dc48 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -516,6 +516,7 @@
List<BtmTypeAttributeVO> beforeAttributes = btmTypeByOid.getAttributes();
// 澶勭悊灞炴�э紝澶氫綑鐨勫垹闄わ紝涓嶅瓨鍦ㄧ殑娣诲姞
afterAttributes = updateAttributeForBtm(btmTypeByOid.getOid(),beforeAttributes, attributes);
+ baseMapper.updateByPrimaryKey(btmTypeDO);
}
BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(btmTypeDO);
//鍦ㄥ垱寤鸿〃鐨勬椂鍊欒繕闇�瑕佹妸榛樿鐨勫瓧娈靛甫涓娿��
@@ -577,8 +578,12 @@
List<BtmTypeAttributeVO> voListAdd = btmTypeAttributeService.checkAndInsert(oid, addList, AuthUtil.getUserAccount(), new Date());
List<BtmTypeAttributeVO> voListUpdate = btmTypeAttributeService.checkAndUpdate(oid, modifyList, AuthUtil.getUserAccount(), new Date());
List<BtmTypeAttributeVO> returnList = new ArrayList<>();
- returnList.addAll(Objects.requireNonNull(voListAdd));
- returnList.addAll(Objects.requireNonNull(voListUpdate));
+ if(!CollectionUtils.isEmpty(voListAdd)) {
+ returnList.addAll(Objects.requireNonNull(voListAdd));
+ }
+ if(!CollectionUtils.isEmpty(voListUpdate)) {
+ returnList.addAll(Objects.requireNonNull(voListUpdate));
+ }
return returnList;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml
index ee86cbd..3657124 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml
@@ -159,14 +159,10 @@
sub_life_cycle_name = #{subLifeCycleName,jdbcType=VARCHAR},
view_flag = #{viewFlag,jdbcType=VARCHAR},
view_create_sql = #{viewCreateSql,jdbcType=VARCHAR},
- btm_name =#{btmName,jdbcType=VARCHAR },
- owner = #{owner,jdbcType=VARCHAR },
- creator = #{creator,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
last_modifier = #{lastModifier,jdbcType=VARCHAR},
last_modify_time = #{lastModifyTime,jdbcType=TIMESTAMP},
ts = #{ts,jdbcType=TIMESTAMP},
- biz-domain = #{bizDomain,jdbcType=VARCHAR},
+ biz_domain = #{bizDomain,jdbcType=VARCHAR},
consistence = #{consistence,jdbcType=VARCHAR}
where OID = #{oid,jdbcType=VARCHAR}
</update>
--
Gitblit v1.9.3