From b6d44be675c36487cf773e1e5f32c9c13ae18536 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 13 七月 2023 10:15:36 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 20 ++++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java | 2 --
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index ca03ae9..50a2502 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -350,6 +350,9 @@
{pattern: /^[A-Za-z]+$/, message: '涓氬姟绫诲瀷缂栧彿鍙兘涓鸿嫳鏂�', trigger: 'blur'},
{min: 2, max: 20, message: '闀垮害鍦�2鍒�20涓瓧绗�', trigger: 'blur'}
],
+ name: [
+ {required: true, message: '璇疯緭鍏ヤ笟鍔＄被鍨嬩腑鏂囧悕绉�', trigger: 'blur'}
+ ],
domain: [
{required: true, message: '璇烽�夋嫨鎵�灞為鍩�', trigger: 'blur'}
]
@@ -450,6 +453,23 @@
// 娣诲姞涓氬姟绫诲瀷
submitBtmType() {
console.log(this.btmType);
+ if (!this.btmType.attributes){
+ this.$message.warning("杩樻病鏈変负涓氬姟绫诲瀷閫夋嫨灞炴��");
+ return;
+ }else{
+ let nullFlag = false;
+ this.btmType.attributes.forEach(item => {
+ if (!item.name){
+ this.$message.warning("绗�" + (item.$index+1) + "琛岀殑涓枃鍚嶇О涓嶈兘涓虹┖");
+ nullFlag = true;
+ return;
+ }
+ })
+ if (nullFlag){
+ return;
+ }
+
+ }
add(this.btmType, true).then(res => {
// 娣诲姞瀹屾垚锛屽洖璋冪埗缁勪欢鐨勫埛鏂�
this.$message.success('淇濆瓨鎴愬姛');
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java
index ffbe5b0..839f8a7 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/dll/DllDmMapperProcessor.java
@@ -73,8 +73,6 @@
&& attributeVO.getAttributeLength() > mappingBO.getDataLength()) {
mappingBO.setDataLength(attributeVO.getAttributeLength());
}
- } else {
- mappingBO.setDataLength(attributeVO.getAttributeLength());
}
mappingBO.setNullable(attributeVO.isNullableFlag());
mappingBO.setDefaultValue(attributeVO.getDefaultValue());
--
Gitblit v1.9.3