tenant: move admin member queries into service

backend/app/http/tenant/tenant_user_admin.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/gofiber/fiber/v3"
 	log "github.com/sirupsen/logrus"
-	"go.ipao.vip/gen"
 )
 
 // tenantUserAdmin provides tenant-admin member management endpoints.
@@ -20,6 +19,44 @@ import (
 //	@provider
 type tenantUserAdmin struct{}
 
+// adminRemoveUser
+//
+//	@Summary	移除租户成员（租户管理）
+//	@Tags		Tenant
+//	@Accept		json
+//	@Produce	json
+//	@Param		tenantCode	path	string	true	"Tenant Code"
+//	@Param		userID		path	int64	true	"UserID"
+//	@Success	200			{object}	requests.Pager
+//
+//	@Router		/t/:tenantCode/v1/admin/users/:userID [delete]
+//	@Bind		tenant local key(tenant)
+//	@Bind		tenantUser local key(tenant_user)
+//	@Bind		userID path
+func (*tenantUserAdmin) adminRemoveUser(
+	ctx fiber.Ctx,
+	tenant *models.Tenant,
+	tenantUser *models.TenantUser,
+	userID int64,
+) error {
+	if err := requireTenantAdmin(tenantUser); err != nil {
+		return err
+	}
+	if userID <= 0 {
+		return errorx.ErrInvalidParameter.WithMsg("user_id must be > 0")
+	}
+
+	log.WithFields(log.Fields{
+		"tenant_id":         tenant.ID,
+		"operator_user_id":  tenantUser.UserID,
+		"target_user_id":    userID,
+		"operator_is_admin": true,
+	}).Info("tenant.admin.users.remove")
+
+	// 关键语义：删除成员接口幂等化；目标用户不属于租户时也返回成功，便于后台重试与批量操作。
+	return services.Tenant.RemoveUser(ctx.Context(), tenant.ID, userID)
+}
+
 // adminJoinUser
 //
 //	@Summary	添加租户成员（租户管理）
@@ -137,7 +174,7 @@ func (*tenantUserAdmin) adminSetUserRole(
 //	@Produce	json
 //	@Param		tenantCode	path		string						true	"Tenant Code"
 //	@Param		filter		query		dto.AdminTenantUserListFilter	true	"Filter"
-//	@Success	200			{object}	requests.Pager{items=models.TenantUser}
+//	@Success	200			{object}	requests.Pager{items=dto.AdminTenantUserItem}
 //
 //	@Router		/t/:tenantCode/v1/admin/users [get]
 //	@Bind		tenant local key(tenant)
@@ -152,32 +189,16 @@ func (*tenantUserAdmin) adminTenantUsers(
 	if err := requireTenantAdmin(tenantUser); err != nil {
 		return nil, err
 	}
-	if filter == nil {
-		filter = &dto.AdminTenantUserListFilter{}
-	}
 
 	log.WithFields(log.Fields{
 		"tenant_id": tenant.ID,
 		"user_id":   tenantUser.UserID,
 		"query_uid": filter.UserID,
+		"role":      filter.Role,
+		"status":    filter.Status,
+		"username":  filter.UsernameTrimmed(),
 	}).Info("tenant.admin.users.list")
 
-	filter.Pagination.Format()
-
-	tbl, query := models.TenantUserQuery.QueryContext(ctx.Context())
-	conds := []gen.Condition{tbl.TenantID.Eq(tenant.ID)}
-	if filter.UserID != nil && *filter.UserID > 0 {
-		conds = append(conds, tbl.UserID.Eq(*filter.UserID))
-	}
-
-	items, total, err := query.Where(conds...).Order(tbl.ID.Desc()).FindByPage(int(filter.Offset()), int(filter.Limit))
-	if err != nil {
-		return nil, err
-	}
-
-	return &requests.Pager{
-		Pagination: filter.Pagination,
-		Total:      total,
-		Items:      items,
-	}, nil
+	// 按 llm.txt 约束：HTTP 层不允许直接查询数据库，全部交由 services 层处理。
+	return services.Tenant.AdminTenantUsersPage(ctx.Context(), tenant.ID, filter)
 }