From dcd669d0f4fad2e9292ee2ae8b2b55de98b1332c Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java
index 7134f33..2c5c118 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java
@@ -386,7 +386,7 @@
* @return Object
*/
@GetMapping("/pageQuery")
- public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ public Object pageQuery(@CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
Map<String, Object> terms = getParameter();
Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
@@ -408,7 +408,7 @@
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- Page<CasedraftInfo> casedraftInfoPage = service.pageQuery(pageRequest, terms);
+ Page<CasedraftInfo> casedraftInfoPage = service.pageQuery(pageRequest, terms,userId);
return ReturnSucUtils.getRepInfo( "处理成功", casedraftInfoPage);
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
--
Gitblit v1.8.0