u

code/allapp/allapp-go/db/queries/space.sql

@@ -39,7 +39,7 @@ FROM space s
     GROUP BY space_id
 ) mc
                    ON s.id = mc.space_id
-WHERE sm.user_id = $1
+WHERE sm.user_id = $1 AND s.status != 2 AND sm.status != 2
 ORDER BY sm.is_default DESC, sm.sort_number ASC;
 
 -- name: GetSpaceByUserIdAndSpaceId :one
@@ -51,7 +51,8 @@ SELECT
     COALESCE(mc.member_count, 0) AS member_count,
     sm.is_default,
     sm.member_name,
-    sm.sort_number
+    sm.sort_number,
+    s.invite_code
 FROM space s
          JOIN space_member sm
               ON s.id = sm.space_id
@@ -61,7 +62,7 @@ FROM space s
     GROUP BY space_id
 ) mc
                    ON s.id = mc.space_id
-WHERE sm.user_id = $1 AND s.id = $2
+WHERE sm.user_id = $1 AND s.id = $2 AND s.status != 2 AND sm.status != 2
 ORDER BY sm.is_default DESC, sm.sort_number ASC;
 
 -- name: UpdateSpaceName :exec

code/allapp/allapp-go/db/queries/space_member.sql

@@ -38,4 +38,11 @@ WHERE user_id = $2
 UPDATE space_member
 SET sort_number = $1
 WHERE user_id = $2
-  AND space_id = $3;
+  AND space_id = $3;
+
+-- 退出空间
+-- name: UpdateSpaceMemberExit :exec
+UPDATE space_member
+SET status = 2 AND exit_time = NOW()
+WHERE space_id = $1
+  AND user_id = $2;