From 9d06f117f92b7c098836c4e8daea8b9a395ef6b1 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 5 Jun 2024 14:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87=E8=BF=87=E6=BB=A4=E5=B7=B2=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java index 4fea993..b1e182a 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentService.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; @Service @Slf4j @@ -33,7 +34,7 @@ public class MesEquipmentService extends BaseMesService implements DdlPreparedPack.getIsNotNull( "workCellCode", packBean1); List workCells = mesWcEquipmentRepository.findByHqlWhere(packBean1); - DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean); + DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode).collect(Collectors.toList()), "equipmentCode", packBean); } DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(), "equipmentName", packBean);