From fa3b0a67d0b98294f8e72af17faba01b9bf154bb Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 25 Oct 2022 18:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/crud/events/EntityEventListener.java | 7 ++++--- .../web/crud/events/ValidateEventListener.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/EntityEventListener.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/EntityEventListener.java index 6366b0a68..80e31bf9a 100644 --- a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/EntityEventListener.java +++ b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/EntityEventListener.java @@ -217,7 +217,6 @@ public class EntityEventListener implements EventListener, Ordered { .collectList() .flatMap((list) -> { List after = createAfterData(list, context); - context.set(readyToUpdateContextKey,after); updated.set(Tuples.of(list, after)); return sendUpdateEvent(list, after, @@ -301,9 +300,11 @@ public class EntityEventListener implements EventListener, Ordered { .setParam(dslUpdate.toQueryParam()) .fetch() .collectList() + .doOnNext(list->{ + context.set(readyToDeleteContextKey, list); + }) .filter(CollectionUtils::isNotEmpty) .flatMap(list -> { - context.set(readyToDeleteContextKey,list); deleted.set(list); return this .sendDeleteEvent(list, (Class) mapping.getEntityType(), EntityBeforeDeleteEvent::new); @@ -476,6 +477,6 @@ public class EntityEventListener implements EventListener, Ordered { @Override public int getOrder() { - return Ordered.LOWEST_PRECEDENCE; + return Ordered.LOWEST_PRECEDENCE - 100; } } diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/ValidateEventListener.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/ValidateEventListener.java index 75f70d816..4d52c1c14 100644 --- a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/ValidateEventListener.java +++ b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/events/ValidateEventListener.java @@ -77,6 +77,6 @@ public class ValidateEventListener implements EventListener, Ordered { @Override public int getOrder() { - return Ordered.LOWEST_PRECEDENCE - 100; + return Ordered.LOWEST_PRECEDENCE - 1000; } }