From b48356e1b39f8e812f85d1627c0fc18e1f4d58ba Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 15 六月 2023 16:42:41 +0800
Subject: [PATCH] 对象建模菜单相关的bug修正
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
index 91090da..164d400 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
@@ -13,6 +13,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -54,7 +55,16 @@
@GetMapping(GET_REF_PAGE)
@Override
public R<IPage<RevisionRuleVO>> getRefPage(BaseQueryObject baseQueryObject) {
- return R.data(service.pageQueryVO(baseQueryObject));
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ if (conditionMap == null){
+ conditionMap = new HashMap<>();
+ }
+ Query query = new Query();
+ query.setSize(baseQueryObject.getLimit());
+ query.setCurrent(baseQueryObject.getPage());
+ Map<String,Object> condition = new HashMap<>();
+ BeanUtil.copy(conditionMap,condition);
+ return R.data(service.pageQueryVO(condition,query));
}
/**
--
Gitblit v1.9.3