From 0dcc09e1c247dee976ee8d95bc6afd04548f3d50 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 30 六月 2023 16:20:42 +0800
Subject: [PATCH] 历史导入的功能开发

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..3ed8b36 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::getDomain, domainValue).orderByAsc(BtmType::getId));
 		if (CollectionUtils.isEmpty(page.getRecords())){
 			return R.data(null);
 		}

--
Gitblit v1.9.3