diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java index 6e90042..8a32393 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenSampleDishesRecordServiceImpl.java @@ -172,7 +172,10 @@ public class KitchenSampleDishesRecordServiceImpl implements IKitchenSampleDishe } for (KitchenSampleDishesRecord fullRecord : fullDishes) { for (KitchenSampleDishesRecord sampleRecord : sampleDishes) { - fullRecord.setSampleSaveTime(sampleRecord.getSampleSaveTime()); + if (fullRecord.getCanteenId().equals(sampleRecord.getCanteenId()) && fullRecord.getStallId().equals(sampleRecord.getStallId()) + && fullRecord.getMealtimeType().equals(sampleRecord.getMealtimeType()) && fullRecord.getDishesId().equals(sampleRecord.getDishesId())) { + fullRecord.setSampleSaveTime(sampleRecord.getSampleSaveTime()); + } } } return fullDishes;