From eadc1f646e81e8ffbe940b13163aee9d107d6663 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 13 三月 2024 09:03:32 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java index e05d6f7..81b90f0 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java @@ -136,7 +136,7 @@ public void exportUserStatistics(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList, HttpServletResponse response){ worldCupGameStatisticsInfoList.setOffset(0); worldCupGameStatisticsInfoList.setLimit(100000); - Map<String, Object> map = worldCupClient.worldCupGameStatisticsInfoList(worldCupGameStatisticsInfoList); + Map<String, Object> map = worldCupClient.getUserGameRecordList(worldCupGameStatisticsInfoList); List<Map<String, Object>> list = (List<Map<String, Object>>)map.get("rows"); try { @@ -151,7 +151,7 @@ values[i] = new String[title.length]; values[i][0] = d.get("name").toString(); values[i][1] = d.get("phone").toString(); - values[i][2] = d.get("idcard").toString(); + values[i][2] = null == d.get("idcard") ? "" : d.get("idcard").toString(); values[i][3] = d.get("totalSession").toString(); values[i][4] = d.get("win").toString() + "-" + d.get("lose").toString(); values[i][5] = d.get("winRate").toString() + "%"; -- Gitblit v1.7.1