From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/AdActivityVersionControlServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/AdActivityVersionControlServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/AdActivityVersionControlServiceImpl.java
index 8fe14fd..a092fa8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/AdActivityVersionControlServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/AdActivityVersionControlServiceImpl.java
@@ -2,7 +2,9 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.annotation.Resource;
@@ -48,7 +50,7 @@
}
@Override
- public List<Long> filterSourceIdByVersion(List<Long> sourceIdList, AdActivityType type, List<Long> versionIdList) {
+ public Set<Long> filterSourceIdByVersion(List<Long> sourceIdList, AdActivityType type, List<Long> versionIdList) {
if (sourceIdList == null || sourceIdList.size() == 0)
return null;
@@ -57,7 +59,7 @@
List<AdActivityVersionControl> list = adActivityVersionControlMapper.listByVersionAndSourceId(sourceIdList,
type, versionIdList);
- List<Long> resultList = new ArrayList<>();
+ Set<Long> resultList = new HashSet<>();
if (list != null)
for (AdActivityVersionControl control : list)
if (control != null && control.getSourceId() != null)
@@ -66,4 +68,12 @@
return resultList;
}
+ @Override
+ public void deleteBySourceAndVersion(Long sourceId, AdActivityType type, Long version) {
+ AdActivityVersionControl control = adActivityVersionControlMapper.selectBySourceIdAndTypeAndVersion(sourceId,
+ type, version);
+ if (control != null)
+ deleteByPrimaryKey(control.getId());
+ }
+
}
--
Gitblit v1.8.0