From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index a267b0e..addf559 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -88,6 +88,19 @@
         return communityService.pageDynamic(comActDynVO);
     }
 
+    @ApiOperation(value = "分页查项目活动")
+    @PostMapping("projectPageActivity")
+    public R projectPageActivity(@RequestBody ComActActivityVO comActActivityVO) {
+        Long projectId = comActActivityVO.getProjectId();
+        if (isNull(projectId)) {
+            Long communityId = this.getCommunityId();
+            comActActivityVO.setCommunityId(communityId);
+        }
+        // return communityService.pageActivity(ComActActivityVO);
+        return communityService.pageActivityCommunityBack(comActActivityVO);
+    }
+
+
     @ApiOperation(value = "社区动态详情", response = ComActDynVO.class)
     @GetMapping("detaildynamic")
     @ApiImplicitParam(name = "id", value = "社区动态主键", required = true)

--
Gitblit v1.7.1