Merge branch 'standalone_develop' into pre_trustie_server

# Conflicts:
#	app/controllers/api/v1/issues_controller.rb
#	app/models/identity_verification.rb
#	app/models/issue.rb
#	app/models/journal.rb
#	app/services/api/v1/issues/list_service.rb
This commit is contained in:
2023-12-15 10:40:58 +08:00
33 changed files with 298 additions and 103 deletions
@@ -31,8 +31,8 @@ module Api::V1::Issues::Concerns::Checkable
def check_attachments (attachment_ids)
raise ApplicationService::Error, "请输入正确的附件ID数组!" unless attachment_ids.is_a?(Array)
attachment_ids.each do |aid|
raise ApplicationService::Error, "请输入正确的附件ID" unless Attachment.exists?(id: aid)
end
raise ApplicationService::Error, "请输入正确的附件ID" unless Attachment.where_id_or_uuid(aid).exists?
end
end
def check_atme_receivers(receivers_login)
@@ -9,7 +9,7 @@ module Api::V1::Issues::Concerns::Loadable
end
def load_attachments(attachment_ids)
@attachments = Attachment.where(id: attachment_ids)
@attachments = Attachment.where("id in (?) or uuid in (?)", attachment_ids, attachment_ids)
end
def load_atme_receivers(receivers_login)