diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 8cbe35c83..dbbb847f7 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -513,7 +513,8 @@ public class WebCadOrderImportFactory { List existRoomNameBodys = orderBodyMapper.selectList(new LambdaUpdateWrapper() .eq(OrderBodyDO::getOrderId, orderId) .eq(OrderBodyDO::getRoomName, roomName) - .eq(OrderBodyDO::getOrganId, organId)); + .eq(OrderBodyDO::getOrganId, organId) + .eq(OrderBodyDO::getDeleted, false)); if (CollUtil.isNotEmpty(existRoomNameBodys)) { roomId = existRoomNameBodys.get(0).getRoomId(); } @@ -862,7 +863,8 @@ public class WebCadOrderImportFactory { List existRoomNameBodys = orderBodyMapper.selectList(new LambdaUpdateWrapper() .eq(OrderBodyDO::getOrderId, orderId) .eq(OrderBodyDO::getRoomName, roomName) - .eq(OrderBodyDO::getOrganId, organId)); + .eq(OrderBodyDO::getOrganId, organId) + .eq(OrderBodyDO::getDeleted, false)); if (CollUtil.isNotEmpty(existRoomNameBodys)) { roomId = existRoomNameBodys.get(0).getRoomId(); }