Commit 7c0b234b authored by gongzijian's avatar gongzijian
Browse files

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

parents 0ef3649e c71e1521

escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }