no message
Showing
1 changed file
with
4 additions
and
1 deletions
| ... | @@ -12,6 +12,7 @@ import com.lego.common.utils.MessageUtils; | ... | @@ -12,6 +12,7 @@ import com.lego.common.utils.MessageUtils; |
| 12 | import com.lego.common.utils.StreamUtils; | 12 | import com.lego.common.utils.StreamUtils; |
| 13 | import com.lego.common.utils.spring.SpringUtils; | 13 | import com.lego.common.utils.spring.SpringUtils; |
| 14 | import com.lego.core.annotation.LanguageAnnotation; | 14 | import com.lego.core.annotation.LanguageAnnotation; |
| 15 | import com.lego.core.domin.BuildingBlock; | ||
| 15 | import com.lego.core.domin.Entirety; | 16 | import com.lego.core.domin.Entirety; |
| 16 | import com.lego.core.domin.bo.EntiretyBo; | 17 | import com.lego.core.domin.bo.EntiretyBo; |
| 17 | import com.lego.core.domin.vo.BuildingBlockVo; | 18 | import com.lego.core.domin.vo.BuildingBlockVo; |
| ... | @@ -35,6 +36,7 @@ import java.util.*; | ... | @@ -35,6 +36,7 @@ import java.util.*; |
| 35 | @Service | 36 | @Service |
| 36 | public class EntiretyServiceImpl implements IEntiretyService { | 37 | public class EntiretyServiceImpl implements IEntiretyService { |
| 37 | private final EntiretyMapper baseMapper; | 38 | private final EntiretyMapper baseMapper; |
| 39 | private final IBuildingBlockService buildingBlockService; | ||
| 38 | private final OssService ossService; | 40 | private final OssService ossService; |
| 39 | 41 | ||
| 40 | public IBuildingBlockService getBuildingBlockService() { | 42 | public IBuildingBlockService getBuildingBlockService() { |
| ... | @@ -82,12 +84,13 @@ public class EntiretyServiceImpl implements IEntiretyService { | ... | @@ -82,12 +84,13 @@ public class EntiretyServiceImpl implements IEntiretyService { |
| 82 | if(StrUtil.isNotBlank(vo.getOssId())){ | 84 | if(StrUtil.isNotBlank(vo.getOssId())){ |
| 83 | vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId())); | 85 | vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId())); |
| 84 | } | 86 | } |
| 85 | List<BuildingBlockVo> buildingBlockVoList = vo.getBuildingblockList(); | 87 | List<BuildingBlockVo> buildingBlockVoList = buildingBlockService.list(language,Collections.singletonList(vo.getId())); |
| 86 | for(BuildingBlockVo blockVo:buildingBlockVoList){ | 88 | for(BuildingBlockVo blockVo:buildingBlockVoList){ |
| 87 | if(StrUtil.isNotBlank(blockVo.getOssId())){ | 89 | if(StrUtil.isNotBlank(blockVo.getOssId())){ |
| 88 | blockVo.setOssUrl(ossService.selectUrlByIds(blockVo.getOssId())); | 90 | blockVo.setOssUrl(ossService.selectUrlByIds(blockVo.getOssId())); |
| 89 | } | 91 | } |
| 90 | } | 92 | } |
| 93 | vo.setBuildingblockList(buildingBlockVoList); | ||
| 91 | } | 94 | } |
| 92 | 95 | ||
| 93 | return list; | 96 | return list; | ... | ... |
-
Please register or sign in to post a comment