diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPlanItemMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPlanItemMapper.java index 5ad87bae9..024fe6674 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPlanItemMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPlanItemMapper.java @@ -36,7 +36,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baiyue.firstl FROM fl_loading_plan_item i JOIN fl_loading_plan p ON p.id=i.loading_plan_id AND p.plan_status IN ('EDITING','LOADING') WHERE i.account_id=#{tenantId} AND i.order_id=#{orderId} AND i.deleted=0 AND i.frozen_at IS NULL - AND (#{excludedItemId} IS NULL OR i.id<>#{excludedItemId}) + AND (#{excludedItemId} IS NULL OR i.id <> #{excludedItemId}) AND NOT (i.customer_remark <=> #{customerRemark} AND i.internal_remark <=> #{internalRemark} AND i.warehouse_remark <=> #{warehouseRemark} @@ -57,7 +57,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baiyue.firstl i.customer_service_remark=#{customerServiceRemark}, i.updated_by=#{operatorId}, i.updated_by_name=#{operatorName}, i.updated_at=CURRENT_TIMESTAMP(3), i.version=i.version+1 WHERE i.account_id=#{tenantId} AND i.order_id=#{orderId} AND i.deleted=0 AND i.frozen_at IS NULL - AND (#{excludedItemId} IS NULL OR i.id<>#{excludedItemId}) + AND (#{excludedItemId} IS NULL OR i.id <> #{excludedItemId}) AND NOT (i.customer_remark <=> #{customerRemark} AND i.internal_remark <=> #{internalRemark} AND i.warehouse_remark <=> #{warehouseRemark}