From 9f8fe1711bb1138903b59bf0140a338725315266 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 17 一月 2022 17:21:48 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 b26c98b..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
@@ -48,8 +48,6 @@
private ComActWorkGuideClassifyDAO comActWorkGuideClassifyDAO;
@Resource
ComActDAO comActDAO;
- @Resource
- private ComActWorkGuideClassifyDAO comActWorkGuideClassifyDAO;
@Override
public R addWorkGuide(ComActWorkGuideDTO workGuideDTO, Long userId) {
@@ -161,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