Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

6 years ago · 7c0b234bb5
1 changed files with 2 additions and 2 deletions
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java
@ -370,8 +370,8 @@ public class DataAnalysisService {
            taskQueueCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds);
        }

-        if (tasksQueueIds.length != 0){
-            taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksQueueIds);
+        if (tasksKillIds.length != 0){
+            taskKillCount = taskInstanceMapper.countTask(loginUser.getId(),loginUser.getUserType(),projectId, tasksKillIds);
        }