fix(club,project): 清理解散社团视图并支持教师导师

api/openapi.yaml

@@ -4392,7 +4392,7 @@ paths:
               schema:
                 $ref: "#/components/schemas/ProjectMember"
         "400":
-          description: 请求参数无效，或候选用户不是所属社团当前有效成员
+          description: 请求参数无效，或普通成员候选用户不是所属社团当前有效成员
           content:
             application/json:
               schema:
@@ -4425,7 +4425,7 @@ paths:
   /api/v1/projects/{projectId}/member-candidates:
     get:
       summary: 获取项目成员候选人
-      description: 仅返回账号正常、属于项目所属社团且当前未参与该项目的有效成员。
+      description: 返回账号正常、尚未参与项目的候选人；普通成员须属于项目所属社团且当前有效，导师候选人为教师账号。
       operationId: getProjectMemberCandidates
       security:
         - bearerAuth: []
@@ -11811,7 +11811,7 @@ components:
 
     ProjectMemberCandidate:
       type: object
-      description: 可加入项目的所属社团当前有效成员。
+      description: 可加入项目的候选人；普通成员来自所属社团当前有效成员，导师为账号正常的教师。
       properties:
         userId:
           type: integer
@@ -11842,7 +11842,7 @@ components:
         userId:
           type: integer
           minimum: 1
-          description: 所属社团当前有效成员的用户 ID。
+          description: 普通成员须为所属社团当前有效成员；导师须为账号正常的教师。
           example: 12
         memberRole:
           type: string

backend.Tests/ClubVisibilityTests.cs

@@ -0,0 +1,131 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
+using ClubHub.Api.Data;
+using ClubHub.Api.Data.Entities;
+using ClubHub.Api.Services;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ClubHub.Api.Tests;
+
+public sealed class ClubVisibilityTests : IClassFixture<ClubHubWebApplicationFactory>
+{
+    private readonly ClubHubWebApplicationFactory _factory;
+    private static int _sequence;
+
+    public ClubVisibilityTests(ClubHubWebApplicationFactory factory) => _factory = factory;
+
+    [Fact]
+    public async Task PublicClubList_ExcludesUnapprovedOrInactiveClubs()
+    {
+        var baseId = 9_300_000 + Interlocked.Increment(ref _sequence) * 10;
+        await using var scope = _factory.Services.CreateAsyncScope();
+        var db = scope.ServiceProvider.GetRequiredService<ClubHubDbContext>();
+        db.Clubs.AddRange(
+            new Club
+            {
+                ClubId = baseId,
+                ClubName = "可见运营社团",
+                AuditStatus = "approved",
+                ClubStatus = "active",
+                CreatedAt = DateTime.UtcNow
+            },
+            new Club
+            {
+                ClubId = baseId + 1,
+                ClubName = "已解散社团",
+                AuditStatus = "approved",
+                ClubStatus = "inactive",
+                CreatedAt = DateTime.UtcNow
+            },
+            new Club
+            {
+                ClubId = baseId + 2,
+                ClubName = "待审核社团",
+                AuditStatus = "pending",
+                ClubStatus = "pending",
+                CreatedAt = DateTime.UtcNow
+            });
+        await db.SaveChangesAsync();
+
+        using var client = _factory.CreateClient();
+        using var response = await client.GetAsync("/api/v1/clubs");
+
+        response.EnsureSuccessStatusCode();
+        using var body = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
+        var names = body.RootElement.EnumerateArray()
+            .Select(club => club.GetProperty("name").GetString())
+            .ToArray();
+        Assert.Contains("可见运营社团", names);
+        Assert.DoesNotContain("已解散社团", names);
+        Assert.DoesNotContain("待审核社团", names);
+    }
+
+    [Fact]
+    public async Task MemberClubList_ExcludesDissolvedClubFromOperationalWorkspaces()
+    {
+        var baseId = 9_301_000 + Interlocked.Increment(ref _sequence) * 10;
+        await using var scope = _factory.Services.CreateAsyncScope();
+        var db = scope.ServiceProvider.GetRequiredService<ClubHubDbContext>();
+        var now = DateTime.UtcNow;
+        db.Users.Add(new User
+        {
+            UserId = baseId,
+            Username = $"club-visibility-user-{baseId}",
+            PasswordHash = "unused",
+            RealName = "社团可见性测试用户",
+            AccountStatus = "normal",
+            CreatedAt = now
+        });
+        db.Clubs.AddRange(
+            new Club
+            {
+                ClubId = baseId + 1,
+                ClubName = "成员可见运营社团",
+                AuditStatus = "approved",
+                ClubStatus = "active",
+                CreatedAt = now
+            },
+            new Club
+            {
+                ClubId = baseId + 2,
+                ClubName = "成员不可见解散社团",
+                AuditStatus = "approved",
+                ClubStatus = "inactive",
+                CreatedAt = now
+            });
+        db.ClubMembers.AddRange(
+            new ClubMember
+            {
+                MemberId = baseId + 3,
+                ClubId = baseId + 1,
+                UserId = baseId,
+                MemberStatus = "active",
+                TermStart = now.AddDays(-1),
+                TermEnd = now.AddDays(30)
+            },
+            new ClubMember
+            {
+                MemberId = baseId + 4,
+                ClubId = baseId + 2,
+                UserId = baseId,
+                MemberStatus = "active",
+                TermStart = now.AddDays(-1),
+                TermEnd = now.AddDays(30)
+            });
+        await db.SaveChangesAsync();
+
+        var token = scope.ServiceProvider.GetRequiredService<AuthTokenService>().CreateToken(
+            new User { UserId = baseId, Username = $"club-visibility-user-{baseId}" });
+        using var client = _factory.CreateClient();
+        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+        using var response = await client.GetAsync("/api/v1/clubs");
+
+        response.EnsureSuccessStatusCode();
+        using var body = JsonDocument.Parse(await response.Content.ReadAsStringAsync());
+        var names = body.RootElement.EnumerateArray()
+            .Select(club => club.GetProperty("name").GetString())
+            .ToArray();
+        Assert.Contains("成员可见运营社团", names);
+        Assert.DoesNotContain("成员不可见解散社团", names);
+    }
+}

backend.Tests/ProjectMembershipServiceTests.cs

@@ -366,6 +366,61 @@ public async Task GetCandidateUsersQuery_ExcludesExistingProjectMembers()
         Assert.Equal("Candidate", candidates[0].RealName);
     }
 
+    [Fact]
+    public async Task GetCandidateUsersQuery_IncludesActiveTeacherWithoutClubMembership()
+    {
+        var baseId = 3250 + Interlocked.Increment(ref _sequence) * 10;
+        var clubId = baseId;
+        var projectId = baseId;
+        await using var scope = _factory.Services.CreateAsyncScope();
+        var db = scope.ServiceProvider.GetRequiredService<ClubHubDbContext>();
+        var service = scope.ServiceProvider.GetRequiredService<ProjectMembershipService>();
+        var now = DateTime.UtcNow;
+
+        var project = new Project
+        {
+            ProjectId = projectId,
+            ProjectName = "Teacher Mentor Project",
+            ClubId = clubId,
+            LeaderUserId = baseId + 10,
+            ProjectStatus = "running",
+            CreatedAt = now
+        };
+
+        db.Add(new Club { ClubId = clubId, ClubName = "Teacher Mentor Club", ClubStatus = "active", CreatedAt = now });
+        db.Add(project);
+        db.Add(new User
+        {
+            UserId = baseId + 1,
+            Username = "teacher-mentor",
+            StudentNo = "05001",
+            PasswordHash = "unused",
+            RealName = "Teacher Mentor",
+            AccountStatus = "normal",
+            CreatedAt = now
+        });
+        db.Add(new Role
+        {
+            RoleId = baseId + 4,
+            RoleCode = "TEACHER",
+            RoleName = "教师",
+            RoleScope = "system",
+            CreatedAt = now
+        });
+        db.Add(new UserRole
+        {
+            UserRoleId = baseId + 5,
+            UserId = baseId + 1,
+            RoleId = baseId + 4,
+            AssignedAt = now
+        });
+        await db.SaveChangesAsync();
+
+        var candidates = await service.GetCandidateUsersQuery(project).ToListAsync();
+
+        Assert.Contains(candidates, candidate => candidate.StudentNo == "05001");
+    }
+
     [Fact]
     public async Task GetCandidateUsersQuery_Defers_CompositionUntilMaterialization()
     {

backend/Controllers/ClubsController.cs

@@ -161,16 +161,22 @@ public async Task<IActionResult> GetAll()
     {
         var query = ClubQuery();
         var userId = User.GetUserId();
-        if (userId is not null)
+        if (userId is null)
+        {
+            query = query.Where(c => c.AuditStatus == AuditApproved && c.ClubStatus == ClubActive);
+        }
+        else
         {
             var viewer = await LoadUserAsync(userId.Value);
             if (viewer is not null && !UsersController.IsPlatformAdmin(viewer))
             {
                 query = query.Where(c =>
-                    c.ApplicantUserId == viewer.UserId ||
-                    c.PresidentUserId == viewer.UserId ||
-                    c.Members.Any(m => m.UserId == viewer.UserId) ||
-                    c.UserRoles.Any(ur => ur.UserId == viewer.UserId));
+                    c.AuditStatus == AuditApproved &&
+                    c.ClubStatus == ClubActive &&
+                    (c.ApplicantUserId == viewer.UserId ||
+                     c.PresidentUserId == viewer.UserId ||
+                     c.Members.Any(m => m.UserId == viewer.UserId) ||
+                     c.UserRoles.Any(ur => ur.UserId == viewer.UserId)));
             }
         }
 

backend/Controllers/ProjectMembersController.cs

@@ -170,7 +170,8 @@ public async Task<IActionResult> AddMember(int projectId, [FromBody] AddProjectM
             return Error(400, "project_member_candidate_disabled", "候选用户账号状态异常，不能加入项目。");
         }
 
-        if (!await _membershipService.IsActiveClubMemberAsync(project.ClubId, request.UserId))
+        if (memberRole != ProjectMembershipService.MentorRole &&
+            !await _membershipService.IsActiveClubMemberAsync(project.ClubId, request.UserId))
         {
             return Error(400, "project_member_candidate_ineligible", "候选用户不是项目所属社团的当前有效成员。");
         }

backend/Models/AddProjectMemberRequest.cs

@@ -26,9 +26,9 @@ namespace Org.OpenAPITools.Models
     public partial class AddProjectMemberRequest 
     {
         /// <summary>
-        /// 所属社团当前有效成员的用户 ID。
+        /// 普通成员须为所属社团当前有效成员；导师须为账号正常的教师。
         /// </summary>
-        /// <value>所属社团当前有效成员的用户 ID。</value>
+        /// <value>普通成员须为所属社团当前有效成员；导师须为账号正常的教师。</value>
         /* <example>12</example> */
         [Required]
         [DataMember(Name="userId", EmitDefaultValue=true)]

backend/Models/ProjectMemberCandidate.cs

@@ -20,7 +20,7 @@
 namespace Org.OpenAPITools.Models
 { 
     /// <summary>
-    /// 可加入项目的所属社团当前有效成员。
+    /// 可加入项目的候选人；普通成员来自所属社团当前有效成员，导师为账号正常的教师。
     /// </summary>
     [DataContract]
     public partial class ProjectMemberCandidate 

backend/Services/ProjectMembershipService.cs

@@ -20,6 +20,7 @@ public class ProjectMembershipService
     private const int MaxWriteRetries = 3;
     private const string ManageProjectTasksPermission = "project:task:manage";
     private static readonly string[] ActiveStatuses = [string.Empty, "active", "normal", "enabled", "在任", "正常"];
+    private static readonly string[] TeacherRoleCodes = ["TEACHER", "ADVISOR"];
 
     private readonly ClubHubDbContext _db;
     private readonly AuthService _authService;
@@ -155,22 +156,27 @@ public IQueryable<User> GetCandidateUsersQuery(Project project)
     {
         var businessDate = DateTime.UtcNow.Date;
 
-        return _db.Users
+        var query = _db.Users
             .AsNoTracking()
             .Where(user =>
                 user.AccountStatus == null || ActiveStatuses.Contains(user.AccountStatus.Trim().ToLower()))
-            .Where(user => user.ClubMemberships.Any(member =>
-                member.ClubId == project.ClubId &&
-                (member.MemberStatus == null || ActiveStatuses.Contains(member.MemberStatus.Trim().ToLower())) &&
-                (member.TermStart == null || member.TermStart <= businessDate) &&
-                (member.TermEnd == null || member.TermEnd >= businessDate)))
+            .Where(user =>
+                user.ClubMemberships.Any(member =>
+                    member.ClubId == project.ClubId &&
+                    (member.MemberStatus == null || ActiveStatuses.Contains(member.MemberStatus.Trim().ToLower())) &&
+                    (member.TermStart == null || member.TermStart <= businessDate) &&
+                    (member.TermEnd == null || member.TermEnd >= businessDate)) ||
+                user.UserRoles.Any(userRole =>
+                    userRole.Role != null && TeacherRoleCodes.Contains(userRole.Role.RoleCode)))
             .Where(user => !_db.ProjectMembers.Any(member =>
                 member.ProjectId == project.ProjectId &&
                 member.UserId == user.UserId &&
                 member.MemberStatus == ActiveStatus))
             .OrderBy(user => user.RealName)
             .ThenBy(user => user.StudentNo)
             .ThenBy(user => user.UserId);
+
+        return query;
     }
 
     /// <summary>

frontend/src/api/apis/DefaultApi.ts

@@ -8430,7 +8430,7 @@ export class DefaultApi extends runtime.BaseAPI {
   }
 
   /**
-   * 仅返回账号正常、属于项目所属社团且当前未参与该项目的有效成员。
+   * 返回账号正常、尚未参与项目的候选人；普通成员须属于项目所属社团且当前有效，导师候选人为教师账号。
    * 获取项目成员候选人
    */
   async getProjectMemberCandidatesRaw(
@@ -8446,7 +8446,7 @@ export class DefaultApi extends runtime.BaseAPI {
   }
 
   /**
-   * 仅返回账号正常、属于项目所属社团且当前未参与该项目的有效成员。
+   * 返回账号正常、尚未参与项目的候选人；普通成员须属于项目所属社团且当前有效，导师候选人为教师账号。
    * 获取项目成员候选人
    */
   async getProjectMemberCandidates(

frontend/src/api/models/AddProjectMemberRequest.ts

@@ -21,7 +21,7 @@ import { mapValues } from "../runtime";
  */
 export interface AddProjectMemberRequest {
   /**
-   * 所属社团当前有效成员的用户 ID。
+   * 普通成员须为所属社团当前有效成员；导师须为账号正常的教师。
    */
   userId: number;
   /**

frontend/src/api/models/ProjectMemberCandidate.ts

@@ -15,7 +15,7 @@
 
 import { mapValues } from "../runtime";
 /**
- * 可加入项目的所属社团当前有效成员。
+ * 可加入项目的候选人；普通成员来自所属社团当前有效成员，导师为账号正常的教师。
  * @export
  * @interface ProjectMemberCandidate
  */