feat: 支持上课统计功能；优化会员管理默认筛选状态

2026-09-09 10:04:29 +08:00
parent 30ebc1c344
commit 99c5c211ad
17 changed files with 594 additions and 20 deletions
--- a/packages/server/src/user/user.service.ts
+++ b/packages/server/src/user/user.service.ts
@@ -382,9 +382,11 @@ export class UserService {
        }
      : {}

-    // cardType filter: NONE = no active membership, otherwise filter by card type category
+    // ACTIVE and NONE are complementary membership-status filters.
    if (cardType === 'NONE') {
      where.NOT = { memberships: { some: { status: MembershipStatus.ACTIVE } } }
+    } else if (cardType === 'ACTIVE') {
+      where.memberships = { some: { status: MembershipStatus.ACTIVE } }
    } else if (cardType && VALID_CARD_TYPES.has(cardType)) {
      where.memberships = {
        some: {