|
@@ -4293,12 +4293,12 @@ public class KwtWaybillOrderV1Service {
|
|
|
List<KwtGatekeeperWaybillOrder> gatekeeperList = gatekeeperMap.getOrDefault(billOrder.getId(), new ArrayList<>());
|
|
List<KwtGatekeeperWaybillOrder> gatekeeperList = gatekeeperMap.getOrDefault(billOrder.getId(), new ArrayList<>());
|
|
|
if (Objects.equals(waybillOrderResp.getConsignUnitId(), mockEntIds.get(0))) {
|
|
if (Objects.equals(waybillOrderResp.getConsignUnitId(), mockEntIds.get(0))) {
|
|
|
KwtGatekeeperWaybillOrder gatekeeper = gatekeeperList.stream()
|
|
KwtGatekeeperWaybillOrder gatekeeper = gatekeeperList.stream()
|
|
|
- .filter(gate -> gate.getType() != null && Objects.equals(gate.getEntId(), mockEntIds.get(0)))
|
|
|
|
|
|
|
+ .filter(gate -> gate.getEntId() != null && Objects.equals(String.valueOf(gate.getEntId()), mockEntIds.get(0)))
|
|
|
.findFirst().orElse(new KwtGatekeeperWaybillOrder());
|
|
.findFirst().orElse(new KwtGatekeeperWaybillOrder());
|
|
|
waybillOrderResp.setGatekeeperId(gatekeeper.getId());
|
|
waybillOrderResp.setGatekeeperId(gatekeeper.getId());
|
|
|
} else {
|
|
} else {
|
|
|
KwtGatekeeperWaybillOrder gatekeeper = gatekeeperList.stream()
|
|
KwtGatekeeperWaybillOrder gatekeeper = gatekeeperList.stream()
|
|
|
- .filter(gate -> gate.getType() != null && Objects.equals(gate.getEntId(), mockEntIds.get(1)))
|
|
|
|
|
|
|
+ .filter(gate -> gate.getEntId() != null && Objects.equals(String.valueOf(gate.getEntId()), mockEntIds.get(1)))
|
|
|
.findFirst().orElse(new KwtGatekeeperWaybillOrder());
|
|
.findFirst().orElse(new KwtGatekeeperWaybillOrder());
|
|
|
waybillOrderResp.setGatekeeperId(gatekeeper.getId());
|
|
waybillOrderResp.setGatekeeperId(gatekeeper.getId());
|
|
|
}
|
|
}
|