From a6dadc1633f8c0b19c8b033f4c560b70211fb67d Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 10:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.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/ComActDynServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
index 30e7974..a8c914b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -99,7 +99,9 @@
comActDynVO.setReadNum(count);
if (nonNull(category) && !category.equals(3)) {
ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
- comActDynVO.setCommunityName(comActDO.getName());
+ if(comActDO!=null){
+ comActDynVO.setCommunityName(comActDO.getName());
+ }
}
return R.ok(comActDynVO);
}
--
Gitblit v1.7.1