修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,9 +25,11 @@
import com.panzhihua.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtServeService;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.util.LambdaSafe;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -150,8 +153,18 @@
        }
        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){
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
            comActDOS = comActDAO.selectList(lambdaQueryWrapper);
        }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 -> {