From cc88ea25dc395b5d1b9b5ac9ddba7713c667c1c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 十二月 2019 12:45:38 +0800
Subject: [PATCH] 专题与banner设置版本管理
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
index e2d1609..629247e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -279,15 +279,10 @@
List<AppVersionInfo> versionList = null;
if (!StringUtil.isNullOrEmpty(version) || !StringUtil.isNullOrEmpty(platform)) {
versionList = new ArrayList<>();
- if (!StringUtil.isNullOrEmpty(version) && !StringUtil.isNullOrEmpty(platform)) {
- AppVersionInfo appVersion = appVersionService.getByPlatformAndVersion(platform, version);
+ if (!StringUtil.isNullOrEmpty(version)) {
+ AppVersionInfo appVersion = appVersionService.selectByPrimaryKey(Long.parseLong(version));
if (appVersion != null)
versionList.add(appVersion);
- } else if (!StringUtil.isNullOrEmpty(version)) {
- List<AppVersionInfo> appVersionList = appVersionService.listByVersion(version);
- if (appVersionList != null) {
- versionList.addAll(appVersionList);
- }
} else {
List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
if (appVersionList != null) {
@@ -317,13 +312,8 @@
List<Long> versionIdList = new ArrayList<>();
for (AppVersionInfo versionInfo : versionList)
versionIdList.add(versionInfo.getId());
- List<Long> sourceIds = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
+ Set<Long> sets = adActivityVersionControlService.filterSourceIdByVersion(sourceIdList,
AdActivityType.special, versionIdList);
- Set<Long> sets = new HashSet<>();
- if (sourceIds != null)
- for (Long sourceId : sourceIds) {
- sets.add(sourceId);
- }
for (int i = 0; i < list.size(); i++) {
if (!sets.contains(list.get(i).getId())) {
list.remove(i--);
@@ -388,7 +378,7 @@
List<Long> versionList = new ArrayList<>();
if (list != null)
for (AdActivityVersionControl control : list)
- versionList.add(control.getId());
+ versionList.add(control.getVersion().getId());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(versionList));
}
--
Gitblit v1.8.0