From 614e133bf6ea21b9e20bdbc459932f72f85a11a1 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 18:18:49 +0800
Subject: [PATCH] 1111修改提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 2e4a78b..b5ed9a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -130,7 +130,9 @@
         Long communityId = convenientMerchantDTO.getCommunityId();
         if (nonNull(communityId)) {
             ComActDO comActDO = comActDAO.selectById(communityId);
-            convenientMerchantDO.setCommunityName(comActDO.getName());
+            if(comActDO!=null){
+                convenientMerchantDO.setCommunityName(comActDO.getName());
+            }
         }
         String account = convenientMerchantDTO.getAccount();
         if (isNotBlank(account)) {

--
Gitblit v1.7.1