From 30436febfa0201f2e3f03eae09dae379fa7f8d70 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:51:10 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index f87f167..79b7ee3 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -27,12 +27,15 @@
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.permit.entity.Permit;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.Map;
/**
* 控制器
@@ -65,8 +68,8 @@
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入record")
- public R<IPage<Record>> list(Record record, Query query) {
- IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record));
+ public R<IPage<Record>> list(@ApiIgnore @RequestParam Map<String, Object> record, Query query) {
+ IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record, Record.class));
return R.data(pages);
}
--
Gitblit v1.9.3