diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java index 06cb365e..7c25a48b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -48,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** @@ -104,9 +105,20 @@ public class PlatingController extends BladeController { qw.orderByAsc(BaseCol.ID); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = PlatingWrapper.build().pageVO(pages); + //bcId + //镀种ID , 镀种名称 + Set bcIds = pagesVO.getRecords().stream().map(PlatingVO::getBcId).collect(Collectors.toSet()); + Map bcIdAndName = basicClazzService + .listByIds(bcIds) + .stream() + .collect(Collectors.toMap(BasicClazz::getId, BasicClazz::getName)); + //basicClazzService pagesVO.getRecords() .stream() - .peek(service::setVOValue) + .peek( s -> { + s.setBcName(bcIdAndName.getOrDefault(s.getBcId(), "-1")); + service.setVOValue(s); + }) .collect(Collectors.toList()); return R.data(pagesVO); }