From 2faea9aa591abfe0303a3753c812f189ae22f703 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 25 Sep 2024 11:40:13 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/users_controller.rb | 13 +++++++++++++
 app/services/gitea/user/delete_service.rb  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admins/users_controller.rb b/app/controllers/admins/users_controller.rb
index e544cfb8e..8d22006f6 100644
--- a/app/controllers/admins/users_controller.rb
+++ b/app/controllers/admins/users_controller.rb
@@ -27,6 +27,19 @@ class Admins::UsersController < Admins::BaseController
 
   def destroy
     UserAction.create(action_id: @user.id, action_type: "DestroyUser", user_id: current_user.id, :ip => request.remote_ip, data_bank: @user.attributes.to_json)
+    org_ids = TeamUser.where(user_id: @user.id).pluck(:organization_id) | OrganizationUser..where(user_id: @user.id).pluck(:organization_id)
+    organizations = Organization.where(id: org_ids)
+    organizations.each do |org|
+      # org.team_users.joins(:team).where(user_id: @user.id, teams: {authorize: %w(owner)})
+      org.team_users.joins(:team).where(teams: {authorize: %w(owner)})
+      # 多个owner时,仅将用户从组织移除, 一个时直接删除
+      if org.count > 1
+        org.team_users.joins(:team).where(user_id: @user.id, teams: {authorize: %w(owner)}).destroy_all
+        org.organization_users.where(user_id: @user.id, organization_id: org.id).destroy_all
+      else
+        org.destroy
+      end
+    end
     @user.destroy!
     Gitea::User::DeleteService.call(@user.login)
     
diff --git a/app/services/gitea/user/delete_service.rb b/app/services/gitea/user/delete_service.rb
index 9011158d2..d70c51575 100644
--- a/app/services/gitea/user/delete_service.rb
+++ b/app/services/gitea/user/delete_service.rb
@@ -6,7 +6,7 @@ class Gitea::User::DeleteService < Gitea::ClientService
   end
 
   def call
-    response = delete(request_url, params)
+    response = delete(request_url, params.merge(purge: true))
 
     render_status(response)
   end