From eade939e7c8441ad9d5b16a0e7bf1a491b586cf7 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期二, 10 八月 2021 13:35:17 +0800 Subject: [PATCH] bug修复 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 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 fc9edcd..53d8f20 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 @@ -217,19 +217,15 @@ public ComActActivityVO inforActivity(Long id, Long userId) { ComActActivityVO comActActivityVO=comActActivityDAO.inforActivity(id); if (!ObjectUtils.isEmpty(comActActivityVO)) { - - LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>(); - actSignQuery.eq(ComActActSignDO::getActivityId, id); if(userId != null){ + LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>(); + actSignQuery.eq(ComActActSignDO::getActivityId, id); actSignQuery.eq(ComActActSignDO::getUserId, userId); - } - - ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery); - if (!ObjectUtils.isEmpty(comActActSignDO)) { - comActActivityVO.setIsSign(1); - comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer()); - }else { - + ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery); + if (!ObjectUtils.isEmpty(comActActSignDO)) { + comActActivityVO.setIsSign(1); + comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer()); + } } } return comActActivityVO; -- Gitblit v1.7.1