From 4b50ee7687be0c63bb5639156e4a3f6a15aaf37a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 07 九月 2021 14:52:06 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 b862290..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
@@ -6,6 +6,10 @@
import javax.annotation.Resource;
+import com.panzhihua.common.utlis.AgeUtils;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.dao.ComActWorkGuideClassifyDAO;
+import com.panzhihua.service_community.model.dos.ComActWorkGuideClassifyDO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
import com.panzhihua.service_community.dao.ComActWorkGuideClassifyDAO;
@@ -41,9 +45,9 @@
@Resource
ComActWorkGuideMaterialDAO workGuideMaterialDAO;
@Resource
- ComActDAO comActDAO;
- @Resource
private ComActWorkGuideClassifyDAO comActWorkGuideClassifyDAO;
+ @Resource
+ ComActDAO comActDAO;
@Override
public R addWorkGuide(ComActWorkGuideDTO workGuideDTO, Long userId) {
@@ -152,6 +156,14 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActWorkGuideVO> iPage = this.baseMapper.pageWorkGuide(page, pageActWorkGuideDTO);
+ if (!iPage.getRecords().isEmpty()) {
+ iPage.getRecords().forEach(comActWorkGuideVO -> {
+ ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideVO.getClassify());
+ if (comActWorkGuideClassifyDO != null) {
+ comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
+ }
+ });
+ }
return R.ok(iPage);
}
--
Gitblit v1.7.1