diff --git a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java index 786784a..f16e12e 100644 --- a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java @@ -63,7 +63,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { // 获取当前年份的第一天 LocalDate firstDayOfYear = LocalDate.now().withDayOfYear(1); Date yearlyStartDate = Date.from(firstDayOfYear.atStartOfDay(ZoneId.systemDefault()).toInstant()); - // markets = generalService.getMarket(); + markets = generalService.getMarket(); // 批量获取统计数据 List currentStatsList = statisticsMapper.selectByMarketsAndDate(markets, @@ -82,7 +82,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { // 并行处理市场列表,创建市场卡片列表 List marketCards = markets.parallelStream() - .filter(market -> market != null && !market.trim().isEmpty()) + .filter(Objects::nonNull) .map(market -> createWorkbenchMarketCard( market, currentStatsMap.getOrDefault(market, null),