From 3432fad3ebcecd73d3d50fa8dfb7934cc61cfd06 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 15:04:16 +0800
Subject: [PATCH] 保安员查询新增审查排序
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index cb7cae7..252d559 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -30,10 +30,13 @@
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
+import org.springblade.modules.punish.entity.Punish;
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 = "传入permit")
- public R<IPage<Permit>> list(Permit permit, Query query) {
- IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit));
+ public R<IPage<Permit>> list(@ApiIgnore @RequestParam Map<String, Object> permit, Query query) {
+ IPage<Permit> pages = permitService.page(Condition.getPage(query), Condition.getQueryWrapper(permit, Permit.class));
return R.data(pages);
}
--
Gitblit v1.9.3