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

7c0b234b · gongzijian · 0ef3649e · c71e1521 · 7c0b234b
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java ...n/java/cn/escheduler/api/service/DataAnalysisService.java +2 -2

未找到文件。
--- 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);
        }