From 9630f5f0c834496da20fca1e391dcdfef1021de1 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 26 七月 2023 17:38:01 +0800
Subject: [PATCH] 关闭弹窗
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..87b7531 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
@@ -60,7 +60,7 @@
attributesDTOList.stream().forEachOrdered(s -> {
attributeService.checkAttribute(s);
btmTypeAttributeDOList.add(BtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
- attributeIdList.add(s.getId().toLowerCase().trim());
+ attributeIdList.add(s.getId().trim());
});
//妫�鏌ュ睘鎬ф槸鍚﹂兘瀛樺湪
boolean exists = attributeService.checkAttributeExists(attributeIdList);
@@ -107,7 +107,7 @@
attributesDTOList.stream().forEachOrdered(s -> {
attributeService.checkAttribute(s);
btmTypeAttributeDOList.add(BtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
- attributeIdList.add(s.getId().toLowerCase().trim());
+ attributeIdList.add(s.getId().trim());
});
//妫�鏌ュ睘鎬ф槸鍚﹂兘瀛樺湪
boolean exists = attributeService.checkAttributeExists(attributeIdList);
@@ -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