From 2be42df39d6201b3626756660943d9fe0da479b5 Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期三, 29 六月 2022 16:22:36 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java index ec59ff4..8e7e815 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java @@ -9,6 +9,7 @@ import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.social.SocialProjectVO; +import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComActSocialMemberDao; import com.panzhihua.service_community.dao.ComActSocialOrgDao; @@ -104,18 +105,17 @@ comActSocialProjectDao.updateById(comActSocialProject); SocialProjectVO projectVO = comActSocialProjectDao.getByApplet(id); if (nonNull(projectVO)) { - ComActSocialOrg socialOrg = comActSocialOrgDao.selectOrgByUserId(userId); - Integer signCount = nonNull(socialOrg) ? comActSocialProjectSignDAO.selectCount(new LambdaQueryWrapper<ComActSocialProjectSign>() - .eq(ComActSocialProjectSign::getProjectId, projectVO.getId()).eq(ComActSocialProjectSign::getOrgId, socialOrg.getId())) : 0; - if(projectVO.getStatus().equals(2) || signCount > 0){ - projectVO.setIsCouldSign(2); - } - else { - projectVO.setIsCouldSign(1); - } List<SocialProjectVO> list = new ArrayList<>(); list.add(projectVO); setSignUpStatus(list); + ComActSocialOrg socialOrg = comActSocialOrgDao.selectOrgByUserId(userId); + Integer signCount = nonNull(socialOrg) ? comActSocialProjectSignDAO.selectCount(new LambdaQueryWrapper<ComActSocialProjectSign>() + .eq(ComActSocialProjectSign::getProjectId, projectVO.getId()).eq(ComActSocialProjectSign::getOrgId, socialOrg.getId())) : 0; + if(!projectVO.getSignUpStatus().equals(1) || signCount > 0) { + projectVO.setIsCouldSign(2); + } else { + projectVO.setIsCouldSign(1); + } } return R.ok(projectVO); } -- Gitblit v1.7.1