u

code/base-project/base-go-v3/db/repo/space_user.sql.go

@@ -109,25 +109,29 @@ func (q *Queries) InsertSpaceUser(ctx context.Context, arg InsertSpaceUserParams
 
 const listSpaceUsers = `-- name: ListSpaceUsers :many
 SELECT
-    u.id as user_id,
+    u.id AS user_id,
     u.username,
+    u.active_time,
     su.role,
     su.join_time
 FROM space_user su
          JOIN space s ON su.space_id = s.id
          JOIN user_info u ON su.user_id = u.id
 WHERE s.id = $1
-ORDER BY su.join_time ASC
+ORDER BY su.role ASC,
+         u.active_time DESC,
+         u.username ASC
 `
 
 type ListSpaceUsersRow struct {
-	UserID   int64
-	Username pgtype.Text
-	Role     int32
-	JoinTime pgtype.Timestamp
+	UserID     int64
+	Username   pgtype.Text
+	ActiveTime pgtype.Timestamp
+	Role       int32
+	JoinTime   pgtype.Timestamp
 }
 
-// 获取空间下的所有用户信息
+// 获取空间下的所有用户信息（按 role, active_time, username 排序）
 func (q *Queries) ListSpaceUsers(ctx context.Context, id int64) ([]ListSpaceUsersRow, error) {
 	rows, err := q.db.Query(ctx, listSpaceUsers, id)
 	if err != nil {
@@ -140,6 +144,7 @@ func (q *Queries) ListSpaceUsers(ctx context.Context, id int64) ([]ListSpaceUser
 		if err := rows.Scan(
 			&i.UserID,
 			&i.Username,
+			&i.ActiveTime,
 			&i.Role,
 			&i.JoinTime,
 		); err != nil {