From 7a37c1b60a89e3da9e521c7f4dd7a7b9f43e5646 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 09 四月 2021 10:18:28 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
index de32519..57e27d8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
@@ -150,8 +150,17 @@
}
ComCvtBusinessVO comCvtBusinessVO = new ComCvtBusinessVO();
BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessVO);
- List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
- List<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds);
+ List<ComActDO> comActDOS = new ArrayList<>();
+
+ if(comCvtBusinessDO.getAreaFlag()==1){
+ comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState,0));
+ }else{
+ List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
+ if(!ObjectUtils.isEmpty(areaIds)){
+ comActDOS = comActDAO.selectBatchIds(areaIds);
+ }
+ }
+
if (!ObjectUtils.isEmpty(comActDOS)) {
List<ComActVO> comActVOS = new ArrayList<>();
comActDOS.forEach(comActDO -> {
--
Gitblit v1.7.1