From 6e9db07a768f2f5d64ea85c537d50111cf0a4f3f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 07 五月 2022 10:57:58 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java |    6 ++++--
 1 files changed, 4 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 9de2870..af114ee 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
@@ -143,13 +143,15 @@
                         circleAppVO.setHaveSign(2);
                     }
                 }
-
+                ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                 if (circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)) {
-                    ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                     if (actDO != null) {
                         circleAppVO.setName(actDO.getName());
                     }
                 }
+                else {
+                    circleAppVO.setCommunityName(actDO.getName());
+                }
 
             }
         }

--
Gitblit v1.7.1