pull_request的部分修改

app/controllers/pull_requests_controller.rb

@@ -281,7 +281,7 @@ class PullRequestsController < ApplicationController
             # @pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
             @pull_request&.project_trends&.update_all(action_type: "close")
 
-            @issue.custom_journal_detail("merge", "", "该合并请求已被合并")
+            @issue&.custom_journal_detail("merge", "", "该合并请求已被合并")
             normal_status(1, "合并成功")
           else
             normal_status(-1, "合并失败")
@@ -381,10 +381,10 @@ class PullRequestsController < ApplicationController
 
   def find_pull_request
     @pull_request = PullRequest.find_by_id(params[:id])
-    @issue = @pull_request.issue
+    @issue = @pull_request&.issue
     if @pull_request.blank?
       normal_status(-1, "合并请求不存在")
-    elsif @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?)
+    elsif @issue.present? && @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?)
       normal_status(-1, "您没有权限")
     end
   end