From 4310c19a73f960dfd79c90cfe960cf564b068f72 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:03:35 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/organ/controller/OrganController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/organ/controller/OrganController.java b/src/main/java/org/springblade/modules/organ/controller/OrganController.java
index 0dd4cf4..f68b22f 100644
--- a/src/main/java/org/springblade/modules/organ/controller/OrganController.java
+++ b/src/main/java/org/springblade/modules/organ/controller/OrganController.java
@@ -30,9 +30,13 @@
import org.springblade.modules.organ.entity.Organ;
import org.springblade.modules.organ.service.IOrganService;
import org.springblade.modules.organ.vo.OrganVO;
+import org.springblade.modules.parcel.util.JsonUtils;
+import org.springblade.modules.policy.entity.Policy;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.Map;
/**
* 控制器
@@ -76,8 +80,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入organ")
- public R<IPage<OrganVO>> page(OrganVO organ, Query query) {
- IPage<OrganVO> pages = organService.selectOrganPage(Condition.getPage(query), organ);
+ public R<IPage<Organ>> page(@ApiIgnore @RequestParam Map<String, Object> organ, Query query) {
+ IPage<Organ> pages = organService.page(Condition.getPage(query), Condition.getQueryWrapper(organ, Organ.class));
return R.data(pages);
}
@@ -121,7 +125,4 @@
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(organService.removeByIds(Func.toLongList(ids)));
}
-
-
-
}
--
Gitblit v1.9.3