admin
2021-01-15 5405154d6979f1b50ce2d881bb164b1acca80b6d
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityAssistController.java
@@ -1,5 +1,6 @@
package com.ks.daylucky.controller.api.client;
import com.google.gson.Gson;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.DTO.AssistJoinInfoDTO;
import com.ks.daylucky.pojo.VO.*;
@@ -99,12 +100,14 @@
            if (uidList.size() > 0) {
                Map<Long, UserInfo> userInfoMap = userInfoService.listUserInfoAsMap(UserInfoUtil.getBaseUserList(recordList));
                for (ActivityAssistFriend assistFriend : recordList) {
                    list.add(new AssistFriendVO(userInfoMap.get(Long.parseLong(assistFriend.getUid())), assistFriend.getAssistCount()));
                    UserInfo user = userInfoMap.get(Long.parseLong(assistFriend.getUid()));
                    list.add(new AssistFriendVO(new SimpleUser(user.getId(), user.getNickName(), user.getPortrait()), assistFriend.getAssistCount()));
                }
            }
        }
        JSONObject data = new JSONObject();
        data.put("data", JsonUtil.getApiCommonGson().toJson(list));
        data.put("data", new Gson().toJson(list));
        data.put("count", count);
        return JsonUtil.loadTrueResult(data);
    }