|
@@ -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;
|
|
|
}
|