From e7e13073ac4ff7140a4aad55c4535fa1d5ccfd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sun, 31 May 2020 16:44:18 +0800 Subject: [PATCH] 1 --- .../kiisoo/ic/activity/listener/WelcomeCreatedListener.java | 4 +++- src/main/resources/application.yml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/kiisoo/ic/activity/listener/WelcomeCreatedListener.java b/src/main/java/com/kiisoo/ic/activity/listener/WelcomeCreatedListener.java index 9dacd9f..df07251 100644 --- a/src/main/java/com/kiisoo/ic/activity/listener/WelcomeCreatedListener.java +++ b/src/main/java/com/kiisoo/ic/activity/listener/WelcomeCreatedListener.java @@ -55,7 +55,9 @@ public class WelcomeCreatedListener { saveStores = saveStores.stream().collect( Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getStoreId()))), ArrayList::new)); - pmnActivityStoreRelationService.remove(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, event.instance().getId()).notIn(PmnActivityStoreRelation::getStoreId, hasStores)); + if(hasStores.size() > 0) { + pmnActivityStoreRelationService.remove(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, event.instance().getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds)); + } pmnActivityStoreRelationService.saveBatch(saveStores); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 556dec4..acbf271 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,5 +13,9 @@ spring: view: prefix: / suffix: .html + servlet: + multipart: + enabled: true + max-file-size: -1