From d74ba542ed1e19fb3d9039db3b2c9209d47163d0 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 23 Oct 2020 17:31:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/organization/TaskNotification.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/settings/organization/TaskNotification.vue b/frontend/src/business/components/settings/organization/TaskNotification.vue
index ac940e47d2..4c93026810 100644
--- a/frontend/src/business/components/settings/organization/TaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/TaskNotification.vue
@@ -577,7 +577,7 @@ export default {
 
       if (data.event && data.userIds.length > 0 && data.type) {
         console.log(data.type)
-        if (data.type === 'NAIL_ROBOT' || data.type === 'NAIL_ROBOT') {
+        if (data.type === 'NAIL_ROBOT' || data.type === 'WECHAT_ROBOT') {
           if (!data.webhook) {
             this.$warning(this.$t('organization.message.message_webhook'));
           } else {

From b2877d0110d712729cf765b543443a27b8627644 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 23 Oct 2020 18:00:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/organization/TaskNotification.vue         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/TaskNotification.vue b/frontend/src/business/components/settings/organization/TaskNotification.vue
index aa4823ee47..5d1c3ca2e2 100644
--- a/frontend/src/business/components/settings/organization/TaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/TaskNotification.vue
@@ -45,8 +45,7 @@
             <el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%">
               <template v-slot:default="{row}">
                 <el-select v-model="row.userIds" filterable multiple
-                           :placeholder="$t('commons.please_select')"
-                           @click.native="userList()" style="width: 100%;" :disabled="!row.isSet">
+                           :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
                   <el-option
                     v-for="item in jenkinsReceiverOptions"
                     :key="item.id"
@@ -144,8 +143,7 @@
             <el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%">
               <template v-slot:default="{row}">
                 <el-select v-model="row.userIds" filterable multiple
-                           :placeholder="$t('commons.please_select')"
-                           @click.native="testPlanUserList()" style="width: 100%;" :disabled="!row.isSet">
+                           :placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
                   <el-option
                     v-for="item in row.testPlanReceiverOptions"
                     :key="item.id"
@@ -241,7 +239,7 @@
               <template v-slot:default="{row}">
                 <el-select v-model="row.userIds" filterable multiple
                            :placeholder="$t('commons.please_select')"
-                           @click.native="reviewUerList()" style="width: 100%;" :disabled="!row.isSet">
+                           style="width: 100%;" :disabled="!row.isSet">
                   <el-option
                     v-for="item in row.reviewReceiverOptions"
                     :key="item.id"
@@ -336,7 +334,7 @@
               <template v-slot:default="{row}">
                 <el-select v-model="row.userIds" filterable multiple
                            :placeholder="$t('commons.please_select')"
-                           @click.native="defectUserList()" style="width: 100%;" :disabled="!row.isSet">
+                           style="width: 100%;" :disabled="!row.isSet">
                   <el-option
                     v-for="item in defectReceiverOptions"
                     :key="item.id"

From bc07ab7a9834263a70c4e8dbe0582d0d3b4936ca Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 23 Oct 2020 18:30:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=B6=88=E6=81=AF=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/track/service/TestPlanService.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 01b8af27f3..7ae31d1ea3 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -542,10 +542,14 @@ public class TestPlanService {
         String eTime = String.valueOf(endTime);
         if (!sTime.equals("null")) {
             start = sdf.format(new Date(Long.parseLong(sTime)));
+        } else {
+            start = "";
         }
         String end = null;
         if (!eTime.equals("null")) {
             end = sdf.format(new Date(Long.parseLong(eTime)));
+        } else {
+            end = "";
         }
         String context = "";
         if (StringUtils.equals(NoticeConstants.CREATE, type)) {