From 37f89b3118620daa2277e227c2abdb574496ef56 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十二月 2020 16:16:40 +0800
Subject: [PATCH] bug修复

---
 service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
index 8c18af2..e35d8ed 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityJoinController.java
@@ -147,7 +147,7 @@
         if (list != null && list.size() > 0) {
             Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(list));
             for (ActivitySimpleUser info : list) {
-                UserInfo user = userInfoMap.get(info.getUid());
+                UserInfo user = userInfoMap.get(Long.parseLong(info.getUid()));
                 if (user != null) {
                     voList.add(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()));
                 }
@@ -204,7 +204,7 @@
         List<ActivityDetailInfoDTO> voList = activityService.getActivityDetail(activityIdList, appId, uid, type == 2 ? true : false);
 
         JSONObject data = new JSONObject();
-        data.put("data", ActivityListItemInfoVOFactory.create(voList));
+        data.put("data",JsonUtil.getSimpleGson().toJson(ActivityListItemInfoVOFactory.create(voList)));
         data.put("count", count);
 
         return JsonUtil.loadTrueResult(data);

--
Gitblit v1.8.0