From fce91b15e13d15ecb0130ec294d7574fd55bc4ad Mon Sep 17 00:00:00 2001
From: baoliang <baoliang@analysys.com.cn>
Date: Tue, 30 Apr 2019 15:07:41 +0800
Subject: [PATCH 1/2] fix bug: error command id is 0.

---
 .../src/main/java/cn/escheduler/dao/model/ErrorCommand.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java b/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java
index 3f839c5868..cdf144f16b 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java
@@ -102,6 +102,7 @@ public class ErrorCommand {
 
 
     public ErrorCommand(Command command, String message){
+        this.id = command.getId();
         this.commandType = command.getCommandType();
         this.executorId = command.getExecutorId();
         this.processDefinitionId = command.getProcessDefinitionId();

From 0a8e0d1c61051bc5b6b2bc91ee0a3fd5e61419d8 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Tue, 30 Apr 2019 14:08:02 +0800
Subject: [PATCH 2/2] project index date update

---
 .../pages/projects/pages/index/_source/defineUserCount.vue    | 1 -
 .../src/js/conf/home/pages/projects/pages/index/index.vue     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
index e0e6297307..818765dae1 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
@@ -59,7 +59,6 @@
         this._handleDefineUser(res)
         this.isSpin = false
       }).catch(e => {
-        this.msg = e.msg || 'error'
         this.isSpin = false
       })
     },
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
index f8f11d7180..4d5d923ac2 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
@@ -2,7 +2,7 @@
   <m-list-construction :title="$t('Project Home')">
     <template slot="content">
       <div class="perject-home-content">
-        <div class="time-model" v-show="searchParams.projectId !== 0">
+        <div class="time-model">
           <x-datepicker
                   :panel-num="2"
                   placement="bottom-end"
@@ -153,4 +153,4 @@
       display: block;
     }
   }
-</style>
\ No newline at end of file
+</style>