From bbd2f2bd0802c3eb5ce14a0a9a08eb25c543e0f2 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Tue, 23 Apr 2019 14:54:26 +0800
Subject: [PATCH] queue count update

---
 .../escheduler/api/service/DataAnalysisService.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
index d2a3cdf1ca..57c05d0689 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
@@ -356,9 +356,18 @@ public class DataAnalysisService {
                 }
             }
         }
+        Integer taskQueueCount = 0;
+        Integer taskKillCount = 0;
+
+        if (tasksQueueIds.length != 0){
+            taskQueueCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds);
+        }
+
+        if (tasksQueueIds.length != 0){
+            taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds);
+        }
+
 
-        Integer taskQueueCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds);
-        Integer taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds);
 
         dataMap.put("taskQueue",taskQueueCount);
         dataMap.put("taskKill",taskKillCount);