Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

删除/恢复柜体优先bodyId后用roomId查询房间下所有柜体

Browse Source
This commit is contained in:
gaoqr
2026-06-09 09:43:21 +08:00
parent 7046d9d368
commit cea0a6a9d2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+9 -6
View File
@@ -996,7 +996,7 @@ public class OrderServiceImpl implements OrderService {
} }
/** /**
* 校验查询柜体，优先roomIds下的所有柜体 * 校验查询柜体，优先bodyId下的所有柜体
* *
* @param orderId * @param orderId
* @param bodyId * @param bodyId
@@ -1009,11 +1009,9 @@ public class OrderServiceImpl implements OrderService {
List<Long> bodyIds = new ArrayList<>(); List<Long> bodyIds = new ArrayList<>();
if (CollUtil.isNotEmpty(roomIds)) { // 柜体id是否为空
bodyIds.addAll(orderBodyMapper.selectBodyIdByRoomId(orderId, roomIds, organId, deleted)); boolean bodyIdIsNull = ObjectUtil.isNotNull(bodyId);
} if (bodyIdIsNull) {
if (bodyId != null && bodyId != 0) {
Long bodyCount = orderBodyMapper.selectCount(new LambdaQueryWrapperX<OrderBodyDO>() Long bodyCount = orderBodyMapper.selectCount(new LambdaQueryWrapperX<OrderBodyDO>()
.eq(OrderBodyDO::getOrganId, organId) .eq(OrderBodyDO::getOrganId, organId)
.eqIfPresent(OrderBodyDO::getDeleted, deleted) .eqIfPresent(OrderBodyDO::getDeleted, deleted)
@@ -1027,6 +1025,11 @@ public class OrderServiceImpl implements OrderService {
bodyIds.add(bodyId); bodyIds.add(bodyId);
} }
// 柜体id为空时查询房间下所有柜体id
if (!bodyIdIsNull && CollUtil.isNotEmpty(roomIds)) {
bodyIds.addAll(orderBodyMapper.selectBodyIdByRoomId(orderId, roomIds, organId, deleted));
}
return bodyIds; return bodyIds;
} }