From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001 From: tangxiaobao <303826152@qq.com> Date: 星期二, 07 九月 2021 09:37:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java index b065e26..8fa8fa3 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java @@ -127,6 +127,25 @@ if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) { neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone()); } + //判断用户的话题是否是新增的 + if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){ + //新增邻里圈话题 + ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>() + .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,neighborCircleDO.getCommunityId()) + .eq(ComActNeighborCircleTopicDO::getName,addNeighborCircleAppDTO.getTopicName())); + if(circleTopicDO == null){ + circleTopicDO = new ComActNeighborCircleTopicDO(); + circleTopicDO.setCommunityId(neighborCircleDO.getCommunityId()); + circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName()); + circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId()); + circleTopicDO.setCreateAt(new Date()); + circleTopicDO.setCount(0); + circleTopicDO.setHotNum(0L); + circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes); + comActNeighborCircleTopicMapper.insert(circleTopicDO); + } + neighborCircleDO.setTopicId(circleTopicDO.getId()); + } //判断当前邻里圈是否需要审核 if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){ //当邻里圈不需要审核才进入自动审核 @@ -141,25 +160,6 @@ neighborCircleDO.setStatus(ComActNeighborCircleDO.status.bh); neighborCircleDO.setRefuseReason("内容违规"); } - } - //判断用户的话题是否是新增的 - if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){ - //新增邻里圈话题 - ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>() - .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,neighborCircleDO.getCommunityId()) - .eq(ComActNeighborCircleTopicDO::getName,addNeighborCircleAppDTO.getTopicName())); - if(circleTopicDO == null){ - circleTopicDO = new ComActNeighborCircleTopicDO(); - circleTopicDO.setCommunityId(neighborCircleDO.getCommunityId()); - circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName()); - circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId()); - circleTopicDO.setCreateAt(new Date()); - circleTopicDO.setCount(1); - circleTopicDO.setHotNum(0L); - circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes); - comActNeighborCircleTopicMapper.insert(circleTopicDO); - } - neighborCircleDO.setTopicId(circleTopicDO.getId()); } if(this.baseMapper.insert(neighborCircleDO) > 0){ -- Gitblit v1.7.1