From 46da6fb73dfd33f39edf8f897212aa3a4f3d9703 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 13 九月 2021 16:26:29 +0800
Subject: [PATCH] 添加merger缺少代码

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.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/ComActWorkGuideServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
index cde44a3..38913b4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -159,7 +159,9 @@
         if (!iPage.getRecords().isEmpty()) {
             iPage.getRecords().forEach(comActWorkGuideVO -> {
                 ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideVO.getClassify());
-                comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
+                if (comActWorkGuideClassifyDO != null) {
+                    comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
+                }
             });
         }
         return R.ok(iPage);

--
Gitblit v1.7.1