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/UserInfoAdminController.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index d3f6ee5..09da2df 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -211,7 +211,7 @@
}
List<UserInfoVO> userList = userInfoService.query((pageIndex - 1) * pageSize, pageSize, type, key, keyType,
- userRank, days, startTime, endTime, orderField, orderMode, userType, level, activeCode);
+ userRank, days, startTime, endTime, orderField, orderMode, userType, level, activeCode,acceptData.getSystem());
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
@@ -219,7 +219,7 @@
}
long count = userInfoService.queryCount(type, key, keyType, userRank, days, startTime, endTime, userType,
- level, activeCode);
+ level, activeCode,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -288,7 +288,7 @@
}
List<UserInfoVO> userList = userInfoService.queryInfo((pageIndex - 1) * pageSize, pageSize, state, key,
- keyType, userRank, days, startTime, endTime, userType, level, activeCode);
+ keyType, userRank, days, startTime, endTime, userType, level, activeCode,acceptData.getSystem());
if (userList == null || userList.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
@@ -296,7 +296,7 @@
}
long count = userInfoService.countInfo(state, key, keyType, userRank, days, startTime, endTime, userType,
- level, activeCode);
+ level, activeCode,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -394,15 +394,14 @@
}
}
- /**
- * 鐢ㄦ埛绮変笣缁熻
- *
- * @param callback
- * @param pageIndex
- * @param pageSize
- * @param id
- * @param out
- */
+
+ /**
+ * 鐢ㄦ埛绮変笣缁熻
+ * @param acceptData
+ * @param callback
+ * @param uid
+ * @param out
+ */
@RequestMapping(value = "countTeamFans")
public void countTeamFans(AdminAcceptData acceptData,String callback, Long uid, PrintWriter out) {
JSONObject data = new JSONObject();
@@ -687,12 +686,14 @@
}
}
- /**
- *
- * @param data
- * @param uid 鐢ㄦ埛ID
- * @param type 闇�瑕佽В缁戠殑璐︽埛绫诲瀷
- */
+ /**
+ *
+ * @param acceptData
+ * @param callback
+ * @param uid
+ * @param typeArray
+ * @param out
+ */
@RequestMapping("unBindUserInfo")
public void unBindUserInfo(AdminAcceptData acceptData,String callback, Long uid, String typeArray, PrintWriter out) {
try {
@@ -965,7 +966,6 @@
* 闃熷憳鍏崇郴
*
* @param pageIndex
- * @param key
* @param state
* @param startTime
* @param endTime
@@ -1070,7 +1070,6 @@
* @param callback
* @param pageIndex
* @param pageSize
- * @param id
* @param out
*/
@RequestMapping(value = "getAccountDetails")
@@ -1470,7 +1469,6 @@
* @param callback
* @param pageIndex
* @param pageSize
- * @param type
* @param out
*/
@RequestMapping(value = "getGoldCoinRecord")
--
Gitblit v1.8.0