From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
index f8dc34e..0e84b51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.yeshi.utils.JsonUtil;
@@ -50,8 +51,8 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Long systemId,
-			PrintWriter out) {
+	public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Long systemId,
+					  PrintWriter out) {
 
 		if (pageIndex == null || pageIndex < 1) {
 			pageIndex = 1;
@@ -61,12 +62,12 @@
 			pageSize = Constant.PAGE_SIZE;
 		}
 
-		List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android");
+		List<AppVersionInfo> versionList = appVersionService.getAppVersionInfoListByPlatform("android",acceptData.getSystem());
 		Map<Integer, String> androidMapName = new HashMap<>();
 		for (AppVersionInfo version : versionList)
 			androidMapName.put(version.getVersionCode(), version.getVersion());
 
-		versionList = appVersionService.getAppVersionInfoListByPlatform("ios");
+		versionList = appVersionService.getAppVersionInfoListByPlatform("ios",acceptData.getSystem());
 		Map<Integer, String> iosMapName = new HashMap<>();
 		for (AppVersionInfo version : versionList)
 			iosMapName.put(version.getVersionCode(), version.getVersion());
@@ -111,7 +112,6 @@
 	 * 鏂板
 	 * 
 	 * @param callback
-	 * @param special
 	 * @param out
 	 */
 	@RequestMapping(value = "saveAdd")

--
Gitblit v1.8.0