Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.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;
@@ -61,7 +62,7 @@
    @Override
    public R listBuildType() {
        List<ComMngStructBuildTypeVO>comMngStructBuildTypeVOS=new ArrayList<>();
        List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(null);
        List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(new LambdaQueryWrapper<>());
        if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) {
            comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> {
                ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO();
@@ -135,7 +136,9 @@
        buildTypdIds.forEach(aLong -> {
            if (!collect.contains(aLong)) {
                ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(aLong);
                throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
                if (!ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
                    throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
                }
            }
        });
         comMngStructBuildTypeDAO.delete(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId, communityId));