From 26c348943563b77052bcd4a8937b8e29f3a0510f Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Thu, 22 Apr 2021 14:28:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=A8=A1=E6=9D=BF=E6=9C=AA=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=20(#2176)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
---
 .../java/io/metersphere/service/IssueTemplateService.java   | 6 +++---
 .../src/business/components/track/issue/IssueEditDetail.vue | 4 ++--
 frontend/src/common/js/table-constants.js                   | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/service/IssueTemplateService.java b/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
index 7343f27eb5..4ca1ad34e9 100644
--- a/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
+++ b/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
@@ -173,11 +173,11 @@ public class IssueTemplateService extends TemplateBaseService {
 
     public IssueTemplateDao getTemplate(String projectId) {
         Project project = projectService.getProjectById(projectId);
-        String caseTemplateId = project.getCaseTemplateId();
+        String issueTemplateId = project.getIssueTemplateId();
         IssueTemplate issueTemplate = null;
         IssueTemplateDao issueTemplateDao = new IssueTemplateDao();
-        if (StringUtils.isNotBlank(caseTemplateId)) {
-            issueTemplate = issueTemplateMapper.selectByPrimaryKey(caseTemplateId);
+        if (StringUtils.isNotBlank(issueTemplateId)) {
+            issueTemplate = issueTemplateMapper.selectByPrimaryKey(issueTemplateId);
             if (issueTemplate == null) {
                 issueTemplate = getDefaultTemplate(project.getWorkspaceId());
             }
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index ad048222dd..b534698c71 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -187,8 +187,8 @@ export default {
         }
       } else {
         this.form = {
-          title: '',
-          description: ''
+          title: this.issueTemplate.title,
+          description: this.issueTemplate.content
         }
         this.url = 'issues/add';
       }
diff --git a/frontend/src/common/js/table-constants.js b/frontend/src/common/js/table-constants.js
index d1e6d907cc..d9fdd78b41 100644
--- a/frontend/src/common/js/table-constants.js
+++ b/frontend/src/common/js/table-constants.js
@@ -25,6 +25,7 @@ export const CASE_TYPE_OPTION = [
 export const ISSUE_PLATFORM_OPTION = [
   {value: 'metersphere',text: 'Metersphere'},
   {value: 'jira',text: 'JIRA'},
+  {value: 'Tapd',text: 'Tapd'},
   {value: 'zentao',text: '禅道'},
 ];