diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 73591f94..67651574 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -8,6 +8,7 @@ import com.ai.da.common.enums.*; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.utils.*; import com.ai.da.mapper.CollectionElementMapper; +import com.ai.da.mapper.GenerateDetailMapper; import com.ai.da.mapper.entity.*; import com.ai.da.mapper.entity.Collection; import com.ai.da.model.dto.*; @@ -66,8 +67,9 @@ public class CollectionElementServiceImpl extends ServiceImpl generateList = generateService.listByIds(generateIds); - if (CollectionUtil.isNotEmpty(generateList)) { - generateCollectionElements.addAll(covertGeneratesToCollections(generateList, null)); + List generateDetailList = generateDetailMapper.selectBatchIds(generateIds); + if (CollectionUtil.isNotEmpty(generateDetailList)) { + generateCollectionElements.addAll(covertGeneratesToCollections(generateDetailList, null)); } } } @@ -389,12 +391,12 @@ public class CollectionElementServiceImpl extends ServiceImpl generateList = generateService.listByIds(generateIds); - if (CollectionUtil.isNotEmpty(generateList)) { + List generateDetailList = generateDetailMapper.selectBatchIds(generateIds); + if (CollectionUtil.isNotEmpty(generateDetailList)) { Map idToMap = designDTO.getPrintBoards() .stream() .collect(Collectors.toMap(DesignCollectionPrintElementDTO::getId, v -> v)); - generateCollectionElements.addAll(covertGeneratesToPrintCollections(generateList, idToMap)); + generateCollectionElements.addAll(covertGeneratesToPrintCollections(generateDetailList, idToMap)); } } } @@ -466,12 +468,12 @@ public class CollectionElementServiceImpl extends ServiceImpl generateList = generateService.listByIds(generateIds); - if (CollectionUtil.isNotEmpty(generateList)) { + List generateDetailList = generateDetailMapper.selectBatchIds(generateIds); + if (CollectionUtil.isNotEmpty(generateDetailList)) { Map idToMap = designDTO.getSketchBoards() .stream() .collect(Collectors.toMap(CollectionSketchDTO::getSketchBoardId, v -> v)); - generateCollectionElements.addAll(covertGeneratesToCollections(generateList, idToMap)); + generateCollectionElements.addAll(covertGeneratesToCollections(generateDetailList, idToMap)); } } } @@ -580,8 +582,8 @@ public class CollectionElementServiceImpl extends ServiceImpl covertGeneratesToCollections(List generates, Map idToMap) { - return CopyUtil.copyList(generates, CollectionElement.class, (o, d) -> { + private List covertGeneratesToCollections(List generateDetailList, Map idToMap) { + return CopyUtil.copyList(generateDetailList, CollectionElement.class, (o, d) -> { if (null != idToMap) { CollectionSketchDTO sketchDTO = idToMap.get(o.getId()); d.setLevel2Type(sketchDTO.getLevel2Type()); @@ -599,8 +601,8 @@ public class CollectionElementServiceImpl extends ServiceImpl covertGeneratesToPrintCollections(List generates, Map idToMap) { - return CopyUtil.copyList(generates, CollectionElement.class, (o, d) -> { + private List covertGeneratesToPrintCollections(List generateDetailList, Map idToMap) { + return CopyUtil.copyList(generateDetailList, CollectionElement.class, (o, d) -> { if (null != idToMap) { DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId()); d.setHasPin(printDTO.getIsPin());