From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
index 488c0a0..8aa5a4b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java
@@ -8,6 +8,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -163,8 +164,8 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
-			String version, String platform, PrintWriter out) {
+	public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+					  String version, String platform, PrintWriter out) {
 
 		if (pageIndex == null || pageIndex < 1) {
 			pageIndex = 1;
@@ -188,7 +189,7 @@
 					if (appVersion != null)
 						versionList.add(appVersion);
 				} else {
-					List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform);
+					List<AppVersionInfo> appVersionList = appVersionService.getAppVersionInfoListByPlatform(platform,acceptData.getSystem());
 					if (appVersionList != null) {
 						versionList.addAll(appVersionList);
 					}
@@ -242,8 +243,6 @@
 	 * 
 	 * @param callback
 	 * @param id
-	 * @param moveType
-	 * @param sex
 	 * @param out
 	 */
 	@RequestMapping(value = "setVersions")

--
Gitblit v1.8.0