From 10bf3d6eee023d328e4b97cfce402d21b0aed211 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期三, 20 七月 2022 17:48:26 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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 1cd9169..5a58c62 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 @@ -346,10 +346,12 @@ @Override public R listActivitySign(ActivitySignVO activitySignVO) { ComActActivityDO comActActivityDO=comActActivityDAO.selectById(activitySignVO.getActivityId()); - if(comActActivityDO!=null&&comActActivityDO.getType()==5){ - IPage<ActivitySignVO> activitySignVOS = comActActSignDAO - .listActivitySignParty(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO); - return R.ok(activitySignVOS); + if(comActActivityDO!=null){ + if(comActActivityDO.getType()==2&&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); -- Gitblit v1.7.1