From 3e63a023f91a1cefbfb72f778bf410b06b021cb9 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 14:14:40 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index c233b8a..1887ba0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -131,7 +131,7 @@
@PostMapping("/list")
public R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO) {
ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent), ComEventVO.class));
+ return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent,this.getLoginUserInfo()), ComEventVO.class));
}
/**
@@ -154,7 +154,7 @@
public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
Page pagination = new Page(pageNo, pageSize);
ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return comEventService.pageByComEvent(comEvent, pagination);
+ return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
}
--
Gitblit v1.7.1