From 1157e8e97e24ec7938deea2e3345a502644fc256 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 05 七月 2023 16:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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..b94fd52 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));
}
@@ -140,7 +140,7 @@
).orElseGet(ArrayList::new)
);
if (CollectionUtils.isEmpty(voList)){
- return R.data(null);
+ return R.data(new ArrayList<>(),"鏆傛棤鏁版嵁鎵胯浇锛�");
}
return R.data(voList);
}
@@ -161,9 +161,6 @@
)
).orElseGet(ArrayList::new)
);
- if (CollectionUtils.isEmpty(voList)){
- return R.data(null);
- }
return R.data(voList);
}
--
Gitblit v1.9.3