处理相互依赖

@@ -2,6 +2,7 @@ package com.lego.core.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.domain.PageQuery;
 import com.lego.common.core.domain.PageQuery;
@@ -9,6 +10,7 @@ import com.lego.common.core.page.TableDataInfo;
 import com.lego.common.core.service.OssService;
 import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.common.utils.MessageUtils;
 import com.lego.common.utils.StreamUtils;
 import com.lego.common.utils.StreamUtils;
+import com.lego.common.utils.spring.SpringUtils;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.domin.Entirety;
 import com.lego.core.domin.Entirety;
 import com.lego.core.domin.bo.EntiretyBo;
 import com.lego.core.domin.bo.EntiretyBo;
@@ -34,7 +36,10 @@ import java.util.*;
 public class EntiretyServiceImpl implements IEntiretyService {
 public class EntiretyServiceImpl implements IEntiretyService {
     private final EntiretyMapper baseMapper;
     private final EntiretyMapper baseMapper;
     private final OssService ossService;
     private final OssService ossService;
-    private final IBuildingBlockService buildingBlockService;
+
+    public IBuildingBlockService getBuildingBlockService() {
+        return SpringUtils.getBean(IBuildingBlockService.class);
+    }
 
 
     /**
     /**
      * 查询所有列表
      * 查询所有列表
@@ -51,7 +56,7 @@ public class EntiretyServiceImpl implements IEntiretyService {
          */
          */
         List<EntiretyVo> list = page.getRecords();
         List<EntiretyVo> list = page.getRecords();
         Set<String> BuildingBlockIdList = StreamUtils.toSet(list,EntiretyVo::getId);
         Set<String> BuildingBlockIdList = StreamUtils.toSet(list,EntiretyVo::getId);
-        List<BuildingBlockVo> BuildingBlockList = buildingBlockService.list(language, BuildingBlockIdList);
+        List<BuildingBlockVo> BuildingBlockList = getBuildingBlockService().list(language, BuildingBlockIdList);
         for(BuildingBlockVo vo : BuildingBlockList){
         for(BuildingBlockVo vo : BuildingBlockList){
             if(StrUtil.isNotBlank(vo.getOssId())) {
             if(StrUtil.isNotBlank(vo.getOssId())) {
                 vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
                 vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));