南京二 实训问题处理 岔心

This commit is contained in:
Jade 2021-11-25 17:47:41 +08:00
parent b97969ab47
commit cbd092b3c6
2 changed files with 4 additions and 1 deletions

View File

@ -61,6 +61,9 @@ public class SectionGeneratorNew implements GeneratorNew {
if (section.isCross() && !sectionTypes.contains(BusinessConsts.Section.SectionType.Type05)) { if (section.isCross() && !sectionTypes.contains(BusinessConsts.Section.SectionType.Type05)) {
continue; continue;
} }
if (section.getParent() != null && section.getParent().isCross()) {
continue;
}
} }
switch (Operation.Type.valueOf(operateDefinitionVO.getOperateType())) { switch (Operation.Type.valueOf(operateDefinitionVO.getOperateType())) {

View File

@ -510,7 +510,7 @@ public class Section extends DelayUnlockDevice {
* @return * @return
*/ */
public boolean isLogicSection() { public boolean isLogicSection() {
return !this.physical && !this.axleCounter && Objects.nonNull(this.parent); return !this.physical && !this.axleCounter && !this.isCross() && Objects.nonNull(this.parent);
} }
/** /**