From 6224d1c19b5d92a2e5dd31eaa36d70fdfb0f5243 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 19 Jul 2021 11:55:53 +0800
Subject: [PATCH] 1.新增保安员列表接口 2.行政区tree 接口修改
---
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index 6867fd4..a7ed2ae 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -27,13 +27,16 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.revoke.entity.Revoke;
import org.springblade.modules.revoke.service.IRevokeService;
import org.springblade.modules.revoke.vo.RevokeVO;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.util.Date;
+import java.util.Map;
/**
* 控制器
@@ -66,8 +69,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入revoke")
- public R<IPage<Revoke>> list(Revoke revoke, Query query) {
- IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke));
+ public R<IPage<Revoke>> list(@ApiIgnore @RequestParam Map<String, Object> revoke, Query query) {
+ IPage<Revoke> pages = revokeService.page(Condition.getPage(query), Condition.getQueryWrapper(revoke, Revoke.class));
return R.data(pages);
}
--
Gitblit v1.9.3