From cea0a6a9d2518ed77b60815d12fd80ff1cca8b43 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 9 Jun 2026 09:43:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4/=E6=81=A2=E5=A4=8D=E6=9F=9C?= =?UTF-8?q?=E4=BD=93=E4=BC=98=E5=85=88bodyId=E5=90=8E=E7=94=A8roomId?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=88=BF=E9=97=B4=E4=B8=8B=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=9F=9C=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/order/OrderServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index adc80bf7d..6faad87da 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -996,7 +996,7 @@ public class OrderServiceImpl implements OrderService { } /** - * 校验查询柜体，优先roomIds下的所有柜体 + * 校验查询柜体，优先bodyId下的所有柜体 * * @param orderId * @param bodyId @@ -1009,11 +1009,9 @@ public class OrderServiceImpl implements OrderService { List bodyIds = new ArrayList<>(); - if (CollUtil.isNotEmpty(roomIds)) { - bodyIds.addAll(orderBodyMapper.selectBodyIdByRoomId(orderId, roomIds, organId, deleted)); - } - - if (bodyId != null && bodyId != 0) { + // 柜体id是否为空 + boolean bodyIdIsNull = ObjectUtil.isNotNull(bodyId); + if (bodyIdIsNull) { Long bodyCount = orderBodyMapper.selectCount(new LambdaQueryWrapperX() .eq(OrderBodyDO::getOrganId, organId) .eqIfPresent(OrderBodyDO::getDeleted, deleted) @@ -1027,6 +1025,11 @@ public class OrderServiceImpl implements OrderService { bodyIds.add(bodyId); } + // 柜体id为空时查询房间下所有柜体id + if (!bodyIdIsNull && CollUtil.isNotEmpty(roomIds)) { + bodyIds.addAll(orderBodyMapper.selectBodyIdByRoomId(orderId, roomIds, organId, deleted)); + } + return bodyIds; }