From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..0990088 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,11 +112,10 @@
* 鏂板
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, SystemClientParams systemClientParams, String idArray, PrintWriter out) {
+ public void saveAdd(AdminAcceptData acceptData,String callback, SystemClientParams systemClientParams, String idArray, PrintWriter out) {
String key = systemClientParams.getKey();
String name = systemClientParams.getName();
@@ -155,7 +155,7 @@
* @param out
*/
@RequestMapping(value = "saveModify")
- public void saveModify(String callback, SystemClientParams systemClientParams, PrintWriter out) {
+ public void saveModify(AdminAcceptData acceptData,String callback, SystemClientParams systemClientParams, PrintWriter out) {
String key = systemClientParams.getKey();
String name = systemClientParams.getName();
@@ -195,7 +195,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
--
Gitblit v1.8.0