From b472a3f1ae21ae77b1476c9c835ffbf635f2c954 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 06 九月 2021 18:41:48 +0800
Subject: [PATCH] bug修复

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 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..53ee395 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,21 +127,6 @@
         if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
             neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
         }
-        //判断当前邻里圈是否需要审核
-        if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
-            //当邻里圈不需要审核才进入自动审核
-            //判断邻里圈自动审核结果
-            if(addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){
-                neighborCircleDO.setStatus(ComActNeighborCircleDO.status.xs);
-                if(neighborCircleDO.getTopicId() != null){
-                    //给邻里圈话题添加邻里圈数量
-                    comActNeighborCircleTopicMapper.addCount(neighborCircleDO.getTopicId());
-                }
-            }else{
-                neighborCircleDO.setStatus(ComActNeighborCircleDO.status.bh);
-                neighborCircleDO.setRefuseReason("内容违规");
-            }
-        }
         //判断用户的话题是否是新增的
         if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){
             //新增邻里圈话题
@@ -161,6 +146,21 @@
             }
             neighborCircleDO.setTopicId(circleTopicDO.getId());
         }
+        //判断当前邻里圈是否需要审核
+        if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
+            //当邻里圈不需要审核才进入自动审核
+            //判断邻里圈自动审核结果
+            if(addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){
+                neighborCircleDO.setStatus(ComActNeighborCircleDO.status.xs);
+                if(neighborCircleDO.getTopicId() != null){
+                    //给邻里圈话题添加邻里圈数量
+                    comActNeighborCircleTopicMapper.addCount(neighborCircleDO.getTopicId());
+                }
+            }else{
+                neighborCircleDO.setStatus(ComActNeighborCircleDO.status.bh);
+                neighborCircleDO.setRefuseReason("内容违规");
+            }
+        }
 
         if(this.baseMapper.insert(neighborCircleDO) > 0){
             return R.ok();

--
Gitblit v1.7.1