From f9276e2632d389705e214bea016ba9f7cad0c6c4 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 22 Aug 2022 09:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9E=E8=AE=AD=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/simulation/cbtc/training2/Step2.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Step2.java b/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Step2.java index d87a21a46..c600523f3 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Step2.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/training2/Step2.java @@ -83,17 +83,17 @@ public class Step2 { this.simulationMember = simulation.getSimulationMemberById(vo.getMemberId()); } this.operations = vo.getOperations().stream().map(o -> { - Valuable t = null; - if (o.getTriggerCondition() != null) { - t = o.getTriggerCondition().convert2BO(simulation.getRepository()); - } - Valuable c = null; - if (o.getCompletionCondition() != null) { - c = o.getCompletionCondition().convert2BO(simulation.getRepository()); - } if (o instanceof Operation2VO.SimOperation2VO) { return new Operation2.SimOperation2((Operation2VO.SimOperation2VO) o, simulation); } else { + Valuable t = null; + if (o.getTriggerCondition() != null) { + t = o.getTriggerCondition().convert2BO(simulation.getRepository()); + } + Valuable c = null; + if (o.getCompletionCondition() != null) { + c = o.getCompletionCondition().convert2BO(simulation.getRepository()); + } return new Operation2.ClientOperation2(t, c); } }).collect(Collectors.toList());