From a438efdb271973368246cac3b761d7263623f55e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 14 五月 2021 10:31:39 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
index fa04c48..c0ace74 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -175,6 +175,9 @@
}
Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
list.forEach(comCvtServeExcelVO -> {
+ /**
+ * 便民服务分类存在 并且 便民服务商家 匹配上
+ */
if (categoryMap.containsKey(comCvtServeExcelVO.getCategoryName()) && businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
BeanUtils.copyProperties(comCvtServeExcelVO, comCvtServeDO);
--
Gitblit v1.7.1