Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
joylink_zhangsai 2021-01-25 19:13:35 +08:00
commit c159f9a8c1

View File

@ -153,7 +153,7 @@ public class CILogicLoop {
if (route.isLock()) { // 进路信号开放始终检查联锁条件是否满足
this.routeService.lockedRouteCheck(simulation, route);
}
if (route.isLock() || route.isNormalUnlock()) {
if (route.isLock()) {
// 进路第一个区段是否占用
Section firstRouteSection = route.getFirstRouteLogicSection();
if (firstRouteSection.isRouteLock() &&