From 69dd6bf325e4d60b1b2697dc2b4c6a5b34c48ac3 Mon Sep 17 00:00:00 2001
From: 康东 <98470202+kangdong59@users.noreply.github.com>
Date: 星期二, 20 六月 2023 14:12:50 +0800
Subject: [PATCH] 业务类型bug修正
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java | 1 +
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 5 ++++-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 13 +++++++++++++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java | 2 +-
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 6 +++++-
5 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index d61723b..1515c8f 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -203,6 +203,7 @@
reserveSelection: true,
searchMenuSpan:8,
highlightCurrentRow: true,
+ rowKey: 'id',
column: [
{
label: '鑻辨枃鍚嶇О',
@@ -373,7 +374,9 @@
},
// 纭灞炴�ф睜鍕鹃��
confirmSelectAttr(){
- this.btmType.attributes = [];
+ if(!this.btmType.attributes){
+ this.btmType.attributes = [];
+ }
this.attrRef.queryNotIn = "";
this.attrRef.selectData.forEach(item => {
this.btmType.attributes.push({
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
index 674618c..4b6d441 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java
@@ -70,6 +70,7 @@
this.put("lastmodifytime", "鏈�鍚庝慨鏀规椂闂�");
this.put("ts", "鏃堕棿鎴�");
this.put("owner", "鎷ユ湁鑰�");
+ this.put("tenentId","绉熸埛");
}
};
BASE_MODEL_COMPATIBILITY_MAP = new HashMap() {
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index 52c6de9..97373b4 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.omd.entity.BtmType;
@@ -83,6 +84,9 @@
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ if (CollectionUtils.isEmpty(page.getRecords())){
+ return R.data(null);
+ }
Page<BtmTypeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
@@ -112,6 +116,9 @@
BtmType queryObj = new BtmType();
BeanMap.create(queryObj).putAll(conditionMap);
List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ if (CollectionUtils.isEmpty(list)){
+ return R.data(null);
+ }
return R.data(BtmTypeWrapper.build().listEntityVO(list));
}
@@ -131,6 +138,9 @@
)
).orElseGet(ArrayList::new)
);
+ if (CollectionUtils.isEmpty(voList)){
+ return R.data(null);
+ }
return R.data(voList);
}
@@ -150,6 +160,9 @@
)
).orElseGet(ArrayList::new)
);
+ if (CollectionUtils.isEmpty(voList)){
+ return R.data(null);
+ }
return R.data(voList);
}
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 3444498..3d59b2d 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
@@ -110,7 +110,11 @@
@Override
public BtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException {
Func.requireNotNull(pkBtmType,"涓氬姟绫诲瀷涓婚敭涓嶈兘涓虹┖");
- BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(baseMapper.selectOne(Wrappers.<BtmType>query().lambda().eq(BtmType::getOid, pkBtmType)));
+ BtmType queryBtmType = baseMapper.selectOne(Wrappers.<BtmType>query().lambda().eq(BtmType::getOid, pkBtmType));
+ if (queryBtmType == null){
+ return null;
+ }
+ BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(queryBtmType);
btmTypeVO.setAttributes(btmTypeAttributeService.getAttributeByBtmTypeOid(pkBtmType));
return btmTypeVO;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
index 8d091d7..c4a1391 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java
@@ -37,7 +37,7 @@
public BtmTypeVO entityVO(BtmType entity) {
BtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeVO.class));
vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
- vo.setTableName(vo.getTableName().toUpperCase(Locale.ROOT));
+ vo.setTableName(vo.getTableName() == null? "" : vo.getTableName().toUpperCase(Locale.ROOT));
// 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
vo.setRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getRevisionFlag()));
vo.setSecretFlag(BooleanEnum.TRUE.getValue().equals(entity.getSecretFlag()));
--
Gitblit v1.9.3