diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index 41b77f65..9179ff06 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -742,10 +742,21 @@ public class PortfolioServiceImpl extends ServiceImpl userLikeSnapshot.getDesignItem().getDesignId())); userLikeMapByDesignId.forEach((designId, userLikeListOld1) -> { Design design = designMapper.selectById(designId); - //数据库中存在designId为-1的情况,此处值从workspace里取 + //数据库中存在designId为-1的情况 if (design == null) { design = new Design(); + //此处值从workspace里取 design.setSystemScale(BigDecimal.valueOf(workspaceOld.getSystemDesignerPercentage()).movePointLeft(2)); + //根据CollectionElement存在model来判断是否是single + List modelTypeElements = collectionElementListOld.stream() + .filter(element -> element.getLevel1Type().equals(CollectionLevel1TypeEnum.MODEL.getRealName())) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(modelTypeElements)){ + design.setSingleOverall("overall"); + }else { + design.setSingleOverall("single"); + } + } design.setId(null); design.setCollectionId(collectionIdNew);