From b2dd01e7ea2b7e37b5f81302f589401fe7e1636d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 07 五月 2021 16:36:13 +0800
Subject: [PATCH] 创建订单返回订单

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 58896d1..3d57ab8 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
@@ -95,7 +95,7 @@
                     circleAppVO.setHaveSign(2);
                 }
 
-                if(circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
+                if(circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
                     ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                     if(actDO != null){
                         circleAppVO.setName(actDO.getName());
@@ -147,7 +147,7 @@
             return R.fail("未找到邻里圈信息");
         }
 
-        if(circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
+        if(circleDetailAppVO.getType() != null && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
             ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
             if(actDO != null){
                 circleDetailAppVO.setName(actDO.getName());

--
Gitblit v1.7.1