Merge remote-tracking branch 'origin/feature_会员模块UI优化' into release_20260831

2026-08-30 14:41:59 +08:00
parent 81912befab 4db67dfccf
commit 479074d684
11 changed files with 2717 additions and 882 deletions
@@ -72,7 +72,8 @@ public class MemberInfoBoardController {
        List<Map> result = new ArrayList<>();
        int year = DateUtil.thisYear();
        for (int i = year - 5; i < year; i++) {
-            int count = memberInfoService.count(Sqls.create("select count(1) from member_history where year = @year ").setParam("year", year));
+            // 历史趋势必须按循环中的年份分别统计，避免五个历史节点都查询成当前年份。
+            int count = memberInfoService.count(Sqls.create("select count(1) from member_history where year = @year ").setParam("year", i));
            result.add(Map.of("label", i, "value", count));
        }
        result.add(Map.of("label", year, "value", memberInfoService.count(Sqls.create("select count(1) from sys_user where member = 1"))));