From 6dfff8368e1202b6c049e42022325a6e8e66faad Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 03 七月 2023 18:16:58 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
index a778063..bdeebe9 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
@@ -191,7 +191,9 @@
 			vo.setId(id);
 			vo.setName(name);
 			vo.setPkBtmType(btmType.getOid());
-			vo.setNullableFlag(false);
+			if ("oid".equals(id)){
+				vo.setNullableFlag(false);
+			}
 			if (Arrays.asList("createtime","lastmodifytime","owner").contains(id)){
 				vo.setAttrDataType(VciFieldTypeEnum.VTDateTime.name());
 				vo.setAttributeLength(6);

--
Gitblit v1.9.3