Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期

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<Statistics> currentStatsList = statisticsMapper.selectByMarketsAndDate(markets,
@@ -82,7 +82,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 
         // 并行处理市场列表，创建市场卡片列表
         List<WorkbenchMarketCard> marketCards = markets.parallelStream()
-                .filter(market -> market != null && !market.trim().isEmpty())
+                .filter(Objects::nonNull)
                 .map(market -> createWorkbenchMarketCard(
                         market,
                         currentStatsMap.getOrDefault(market, null),