From 261d715822e5464334ea1bffc60a5f86e371d8f7 Mon Sep 17 00:00:00 2001 From: liyj <1003249715@qq.com> Date: Sun, 08 Sep 2024 17:48:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java index 06fb123..982288a 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/wechat/CaseInfoWechatController.java @@ -7,7 +7,6 @@ import cn.huge.base.config.CurrentUser; import cn.huge.module.cases.domain.dto.CaseInfoWeChatDTO; import cn.huge.module.cases.domain.dto.RegisterSaveDTO; -import cn.huge.module.cases.domain.po.CaseInfo; import cn.huge.module.cases.service.CaseInfoService; import cn.huge.module.client.api.impl.UtilsClientImpl; import com.google.common.collect.Maps; @@ -92,9 +91,9 @@ * @CurrentUser String userId, */ @GetMapping("/pageCard") - public Object pageCard(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) { + public Object pageCard(@CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) { try { - String userId = "2408301111391000"; +// String userId = "2408301111391000"; Map<String, Object> terms = getParameter(); Sort sort = Sort.by(Sort.Direction.DESC, "create_time"); PageRequest pageRequest = PageRequest.of(page-1, size, sort); -- Gitblit v1.8.0