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

chore: auto bump version and changelog [skip ci]

iwt 2 недель назад
Родитель
Сommit
004b20fcfd

+ 2 - 7
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthReportController.java

@@ -1404,14 +1404,9 @@ public class HealthReportController {
             // 指定报告:返回该报告的食材推荐
             foods = foodService.listByReportId(reportId);
         } else {
-            // 未指定报告:返回当前用户最新报告的食材推荐(当前最适合
+            // 未指定报告:返回维护的"当前食材"推荐(food_recommend_idx,有新报告时 upsert 更新
             Long uid = userId != null ? userId : -1L;
-            HealthReport latest = healthReportService.getLatestReport(uid);
-            if (latest == null) {
-                foods = java.util.Collections.emptyList();
-            } else {
-                foods = foodService.listByReportId(latest.getId());
-            }
+            foods = foodRecommendService.getCurrentFoodsAsFoodList(uid);
         }
         return Result.success(foods);
     }

+ 5 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/FoodService.java

@@ -183,4 +183,9 @@ public class FoodService {
         }
         log.info("已保存{}条食材推荐到报告{}", foods.size(), reportId);
     }
+
+    public List<Food> listByIds(Collection<Long> ids) {
+        if (ids == null || ids.isEmpty()) return new ArrayList<>();
+        return foodMapper.selectBatchIds(ids);
+    }
 }

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-77af25cd183284f1e7d2efebc1150d3fd65a02cb
+f382501474dc6084843d95c7c6b6d9465dc575d7