LingxinMeng 2 жил өмнө
parent
commit
019a0e0fc0

+ 1 - 1
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java

@@ -803,7 +803,7 @@ public class ProjectDomainService {
     public void removeWaitQueueOfExecute(String projectId) {
         List<ProjectWaitQueueEntity> waitQueue = getWaitQueue();
         for (ProjectWaitQueueEntity projectWaitQueueEntity : waitQueue) {
-            if (projectWaitQueueEntity.getProjectMessageModel().getProjectId().equals(projectId) || projectWaitQueueEntity.getWaitingType().equals(DictConstants.PROJECT_WAIT_TYPE_EXECUTE)) {
+            if (projectWaitQueueEntity.getProjectMessageModel().getProjectId().equals(projectId) && projectWaitQueueEntity.getWaitingType().equals(DictConstants.PROJECT_WAIT_TYPE_EXECUTE)) {
                 waitQueue.remove(projectWaitQueueEntity);
                 break;
             }