From 1d0042d823333554cc1b74b092496e5aff38d502 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 04 七月 2023 18:46:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 97373b4..6d62a18 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
@@ -78,12 +78,13 @@
String domainValue = conditionMap.get(DOMAIN);
VciBaseUtil.alertNotNull(domainValue,"棰嗗煙鍊�");
conditionMap.remove(DOMAIN);
- BtmType queryObj = new BtmType();
- BeanMap.create(queryObj).putAll(conditionMap);
+// BtmType queryObj = new BtmType();
+// BeanMap.create(queryObj).putAll(conditionMap);
+ Map<String, Object> condition = new HashMap<>(conditionMap);
Query query = new Query();
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));
+ 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);
}
@@ -115,7 +116,7 @@
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);
}
--
Gitblit v1.9.3