diff --git a/src/main/java/com/chint/application/system/SystemController.java b/src/main/java/com/chint/application/system/SystemController.java index 3c818a1b..af36f569 100644 --- a/src/main/java/com/chint/application/system/SystemController.java +++ b/src/main/java/com/chint/application/system/SystemController.java @@ -80,6 +80,7 @@ public class SystemController { return Result.Success(SUCCESS, null); } } + systemAnnouncement.setSystemAnnouncementEmployeeList(null); return Result.Success(SUCCESS, systemAnnouncement); } diff --git a/src/main/java/com/chint/domain/service/leg_event/LegEventHandler.java b/src/main/java/com/chint/domain/service/leg_event/LegEventHandler.java index dba55087..7decb217 100644 --- a/src/main/java/com/chint/domain/service/leg_event/LegEventHandler.java +++ b/src/main/java/com/chint/domain/service/leg_event/LegEventHandler.java @@ -35,7 +35,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -206,8 +205,8 @@ public class LegEventHandler implements LegEventService { OrderLegData data = command.getData(); String orderNo = data.getSelfOrderNo(); RouteOrder routeOrder = routeRequestDomainService.getRouteOrder(orderNo); - if(routeOrder == null){ - throw new OrderException(NOT_FOUND + ",单号:orderNo"); + if (routeOrder == null) { + throw new OrderException(NOT_FOUND + ",单号:" + orderNo); } String employeeNo = routeOrder.getUserId(); User byUserEmployeeNo = userRepository.findByUserEmployeeNo(employeeNo);