From e59e4e4bd5432d6dd57008690b86af6648b93fde Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 28 Feb 2023 17:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/api/v1/issues/journals/create_service.rb |  9 +++++----
 app/services/api/v1/issues/journals/update_service.rb | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/services/api/v1/issues/journals/create_service.rb b/app/services/api/v1/issues/journals/create_service.rb
index 82a279d45..dce00349b 100644
--- a/app/services/api/v1/issues/journals/create_service.rb
+++ b/app/services/api/v1/issues/journals/create_service.rb
@@ -24,10 +24,10 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService
     ActiveRecord::Base.transaction do 
       check_parent_journal(parent_id) if parent_id.present? 
       check_parent_journal(reply_id) if reply_id.present? 
-      check_attachments(attachment_ids) unless attachment_ids.blank?
-      check_atme_receivers(receivers_login) unless receivers_login.blank?
-      load_attachments(attachment_ids) unless attachment_ids.blank?
-      load_atme_receivers(receivers_login) unless receivers_login.blank?
+      check_attachments(attachment_ids) unless attachment_ids.nil?
+      check_atme_receivers(receivers_login) unless receivers_login.nil?
+      load_attachments(attachment_ids) unless attachment_ids.nil?
+      load_atme_receivers(receivers_login) unless receivers_login.nil?
 
       try_lock("Api::V1::Issues::Journals::CreateService:#{@issue.id}")
       @created_journal = @issue.journals.new(journal_attributes)
@@ -37,6 +37,7 @@ class Api::V1::Issues::Journals::CreateService < ApplicationService
       @created_journal.attachments = @attachments unless attachment_ids.blank?
       
       @created_journal.save!
+      @issue.save!
 
       # @信息发送
       AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank?
diff --git a/app/services/api/v1/issues/journals/update_service.rb b/app/services/api/v1/issues/journals/update_service.rb
index 70c6fe4d5..e5031aafe 100644
--- a/app/services/api/v1/issues/journals/update_service.rb
+++ b/app/services/api/v1/issues/journals/update_service.rb
@@ -20,10 +20,10 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService
   def call 
     raise Error, errors.full_messages.join(", ") unless valid?
     ActiveRecord::Base.transaction do 
-      check_attachments(attachment_ids) unless attachment_ids.blank?
-      check_atme_receivers(receivers_login) unless receivers_login.blank?
-      load_attachments(attachment_ids) unless attachment_ids.blank?
-      load_atme_receivers(receivers_login) unless receivers_login.blank?
+      check_attachments(attachment_ids) unless attachment_ids.nil?
+      check_atme_receivers(receivers_login) unless receivers_login.nil?
+      load_attachments(attachment_ids) unless attachment_ids.nil?
+      load_atme_receivers(receivers_login) unless receivers_login.nil?
 
       try_lock("Api::V1::Issues::Journals::UpdateService:#{@issue.id}:#{@journal.id}")
       @updated_journal = @journal
@@ -31,9 +31,10 @@ class Api::V1::Issues::Journals::UpdateService < ApplicationService
 
       build_atme_participants if @atme_receivers.present?
 
-      @updated_journal.attachments = @attachments unless attachment_ids.blank?
+      @updated_journal.attachments = @attachments unless attachment_ids.nil?
       
       @updated_journal.save!
+      @issue.save!
 
       # @信息发送
       AtmeService.call(current_user, @atme_receivers, @created_journal) unless receivers_login.blank?