Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 6 дней назад
Родитель
Сommit
d3ec274c9e

+ 3 - 2
cfc-backend/src/main/java/com/etotem/cfc/service/BeijingNutritionService.java

@@ -746,6 +746,7 @@ public class BeijingNutritionService {
 
         List<ScoredIngredient> result = new ArrayList<>();
         Map<String, Integer> categoryCount = new HashMap<>();
+        Set<Long> selectedIds = new HashSet<>();
         int targetMin = 10, targetMax = 12;
 
         for (Map.Entry<String, CategoryQuota> entry : CATEGORY_QUOTA.entrySet()) {
@@ -755,18 +756,18 @@ public class BeijingNutritionService {
 
             List<ScoredIngredient> catCandidates = scored.stream()
                 .filter(s -> cat.equals(s.category))
-                .filter(s -> !result.contains(s))
+                .filter(s -> !selectedIds.contains(s.foodId))
                 .collect(Collectors.toList());
 
             int take = Math.min(max, catCandidates.size());
             for (int i = 0; i < take; i++) {
                 result.add(catCandidates.get(i));
+                selectedIds.add(catCandidates.get(i).foodId);
             }
             categoryCount.put(cat, take);
         }
 
         if (result.size() < targetMin) {
-            Set<Long> selectedIds = result.stream().map(s -> s.foodId).collect(Collectors.toSet());
             List<ScoredIngredient> remaining = scored.stream()
                 .filter(s -> !selectedIds.contains(s.foodId))
                 .collect(Collectors.toList());

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-3c2803f3ecce5d23ffb1dddf1b2f313169751922
+be6f6dbf159e06d8880fbc715bd642773f481233