From 325f3453813b224d0ed78622f797d7cb4aace385 Mon Sep 17 00:00:00 2001 From: chenjing Date: Mon, 19 Jun 2023 15:10:16 +0800 Subject: [PATCH] fix --- app/models/user_cla.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/user_cla.rb b/app/models/user_cla.rb index cd3cea8a8..848a825db 100644 --- a/app/models/user_cla.rb +++ b/app/models/user_cla.rb @@ -30,8 +30,8 @@ class UserCla < ApplicationRecord fresh_pull_request end - def self.build(params,user_id) - self.create!(user_id: user_id, + def self.build(params,current_user_id) + self.create!(user_id: current_user_id, cla_id: params[:cla_id], real_name: params[:real_name], email: params[:email], @@ -40,11 +40,11 @@ class UserCla < ApplicationRecord end def fresh_pull_request - gitea_ids = Project.where(user_id: cla.user_id).pluck(:gpid) + project_ids = cla.organization.projects.pluck(:id) if state == "signed" - PullRequest.where(user_id: user_id, gitea_id: gitea_ids, status:3).update_all(status:0) + PullRequest.where(user_id: user_id, project_id: project_ids, status:3).update_all(status:0) else - PullRequest.where(user_id: user_id, gitea_id: gitea_ids, status:0).update_all(status:3) + PullRequest.where(user_id: user_id, project_id: project_ids, status:0).update_all(status:3) end end