From f0e91343445b1e568d1dfe705252d3e1201a18a7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 七月 2022 18:02:36 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index d47001b..3582951 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -361,10 +361,16 @@
*/
@Override
public R listActivitySign(ActivitySignVO activitySignVO) {
-
+ ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId());
+ if(comActActivityDO!=null){
+ if(comActActivityDO.getType()==3||comActActivityDO.getType()==5){
+ IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
+ .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
+ return R.ok(activitySignVOS);
+ }
+ }
IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
.listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
- // List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
return R.ok(activitySignVOS);
}
--
Gitblit v1.7.1