From c2ee2b74bd587fdad8e9e276beb3c792f56f5b6c Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 05 七月 2023 16:33:55 +0800
Subject: [PATCH] 业务类型和元数据相关的修正
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
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 3ed8b36..8bd40d9 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
@@ -84,7 +84,7 @@
Query query = new Query();
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
- IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
if (CollectionUtils.isEmpty(page.getRecords())){
return R.data(null);
}
@@ -116,9 +116,9 @@
conditionMap.remove(DOMAIN);
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));
+ List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
if (CollectionUtils.isEmpty(list)){
- return R.data(null);
+ return R.data(new ArrayList<>());
}
return R.data(BtmTypeWrapper.build().listEntityVO(list));
}
@@ -139,9 +139,6 @@
)
).orElseGet(ArrayList::new)
);
- if (CollectionUtils.isEmpty(voList)){
- return R.data(null);
- }
return R.data(voList);
}
@@ -161,9 +158,6 @@
)
).orElseGet(ArrayList::new)
);
- if (CollectionUtils.isEmpty(voList)){
- return R.data(null);
- }
return R.data(voList);
}
--
Gitblit v1.9.3