From 8588c486e30e8034f9bb928885ea63bee68c3fe4 Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 4 Sep 2024 09:46:39 +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/controllers/api/pm/issues_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index 770be6a9c..a3875b6c0 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -176,10 +176,10 @@ class Api::Pm::IssuesController < Api::Pm::BaseController issue.fake_id = row[0] issue.subject = row[1] issue.description = row[2] - author = User.find_by(login: row[3]) || User.where(admin: true).first + author = User.find_by(login: row[3]) issue.user = author issue.created_on = row[4] - changer = User.find_by(login: row[5]) || User.where(admin: true).first + changer = User.find_by(login: row[5]) issue.changer = changer issue.updated_on = row[6] issue.status_id = row[7].to_i @@ -224,6 +224,8 @@ class Api::Pm::IssuesController < Api::Pm::BaseController next if link_issue.blank? || be_link_issue.blank? PmLink.create!(linkable_type: 'Issue', linkable_id: link_issue.id, be_linkable_type: 'Issue', be_linkable_id: be_link_issue.id) end + else + return render_error('导入失败，请上传正确格式的excel文件') end end