From 8ad0807067030acc6d284af963e8dc110bff9a81 Mon Sep 17 00:00:00 2001 From: lulz1 Date: Fri, 28 Jun 2024 23:03:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E5=AF=BC=E8=87=B4=E5=90=8C=E6=AD=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=9B=A0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=AF=E5=90=8C=E6=AD=A5=E8=A1=8C=E7=A8=8B=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chint/application/services/OrderApplicationService.java | 2 +- .../com/chint/domain/aggregates/user/UserDepartmentInfo.java | 1 - src/main/java/com/chint/domain/service/LegDomainService.java | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chint/application/services/OrderApplicationService.java b/src/main/java/com/chint/application/services/OrderApplicationService.java index 305f2139..2fcca046 100644 --- a/src/main/java/com/chint/application/services/OrderApplicationService.java +++ b/src/main/java/com/chint/application/services/OrderApplicationService.java @@ -101,7 +101,7 @@ public class OrderApplicationService { routeRepository.save(routeOrder); // 仅在所有操作完成后保存一次 } //如果行程变更成功,自动执行同步功能 - Command.of(RouteAutoSyncCommand.class).route(routeOrder).async().sendToQueue(); +// Command.of(RouteAutoSyncCommand.class).route(routeOrder).async().sendToQueue(); } @Transactional diff --git a/src/main/java/com/chint/domain/aggregates/user/UserDepartmentInfo.java b/src/main/java/com/chint/domain/aggregates/user/UserDepartmentInfo.java index 326be616..09bba0c0 100644 --- a/src/main/java/com/chint/domain/aggregates/user/UserDepartmentInfo.java +++ b/src/main/java/com/chint/domain/aggregates/user/UserDepartmentInfo.java @@ -20,7 +20,6 @@ public class UserDepartmentInfo implements Serializable { @Id private Long id; private Long userId; - private Integer userKey; private String companyCode; private String companyName; private String departmentCodeOne; diff --git a/src/main/java/com/chint/domain/service/LegDomainService.java b/src/main/java/com/chint/domain/service/LegDomainService.java index 0a1ba8d2..9cb903fd 100644 --- a/src/main/java/com/chint/domain/service/LegDomainService.java +++ b/src/main/java/com/chint/domain/service/LegDomainService.java @@ -199,6 +199,7 @@ public class LegDomainService { // 过滤Leg items List filteredLegItems = legItems.stream() .filter(it -> !it.getLegType().equals(LEG_TYPE_OTHER) && it.legIsInternal()) + .peek(Leg::reloadStatus) .filter(it -> it.getLegApprovalStatus().equals(LEG_APPROVAL_STATUS_NOT)) .toList();