From 41d04e9e9947bb650ddff051761031cc1304fafc Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 16 Sep 2021 18:39:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E7=AD=BE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb        | 1 +
 app/controllers/pull_requests_controller.rb | 3 ++-
 config/locales/zh-CN.yml                    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 266d746d7..bbde2ecb3 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -158,6 +158,7 @@ class IssuesController < ApplicationController
   def update
     last_token = @issue.token
     last_status_id = @issue.status_id
+    @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
     if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
       @issue&.issue_tags_relates&.destroy_all
       params[:issue_tag_ids].each do |tag|
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 79221a665..7950d343d 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -77,12 +77,13 @@ class PullRequestsController < ApplicationController
     if params[:title].nil?
       normal_status(-1, "名称不能为空")
     elsif params[:issue_tag_ids].nil?
-      normal_status(-1, "标签不能为空")
+      normal_status(-1, "标记不能为空")
     else
       ActiveRecord::Base.transaction do
         begin
           merge_params
 
+          @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
           if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
             @issue&.issue_tags_relates&.destroy_all
             params[:issue_tag_ids].each do |tag|
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index db1030163..f6f478625 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -31,7 +31,7 @@ zh-CN:
     branch_name: 分支
     close_pr: 合并
     merge: 合并
-    issue_tags_value: 标签
+    issue_tags_value: 标记
     lock_issue: 锁定工单
     unlock_issue: 解锁工单
     destroy_issue_depend: 删除依赖
@@ -55,7 +55,7 @@ zh-CN:
     f: 否
     true: 是
     false: 否
-    issue_tag_ids: 标签
+    issue_tag_ids: 标记
     issue_type: 分类
     token: 悬赏金额
     close_issue: 工单