From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..aeca2c2 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,8 +13,11 @@
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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -54,7 +57,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));
}
/**
@@ -78,8 +90,8 @@
* @return 涓氬姟瀵硅薄
*/
@Override
- @GetMapping(GET_BY_IDS)
- public R<List<RevisionRuleVO>> selectByIdCollection(List<String> ids) {
+ @PostMapping(GET_BY_IDS)
+ public R<List<RevisionRuleVO>> selectByIdCollection(@RequestBody List<String> ids) {
return R.data(service.listRevisionRuleByIdCollection(ids));
}
--
Gitblit v1.9.3