From dda330f95d37e1632d9d5a3bd395c66dd6a4a15a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 15 三月 2023 16:18:45 +0800
Subject: [PATCH] 新增银联支付
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 6 ++++--
1 files changed, 4 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 cde44a3..d5dc0c5 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);
@@ -183,7 +185,7 @@
//结果数据集合
List<ComActWorkGuideAppletsVO> resultList = new ArrayList<>();
- List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify();
+ List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify(pageActWorkGuideDTO.getAreaCode());
//通过办事指南分类查询分类下办事指南
workGuideClassifyList.forEach(workGuideClassify -> {
List<ComActWorkGuideDetailAppletsVO> workGuideList = this.baseMapper.getWorkGuideListByClassifyId(workGuideClassify.getId(),10L);
--
Gitblit v1.7.1