From e4c64bf1edc05a164406778e9cfaa86744210d05 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 13 九月 2021 21:06:24 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
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