|
|
|
@@ -1385,28 +1385,28 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
//// |
|
|
|
//// } |
|
|
|
// |
|
|
|
// List<WxTags> tagList = wxTagsMapper.findListAll(); |
|
|
|
List<WxTags> tagList = wxTagsMapper.findListAll(); |
|
|
|
// |
|
|
|
// Map<Long, Integer> finalChaddMap = chaddMap; |
|
|
|
// Map<Long, Integer> finalChlesMap = chlesMap; |
|
|
|
//// Map<Long, String> finalUserTagsMap = userTagsMap; |
|
|
|
// Map<Long, String> finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; |
|
|
|
// list.stream().forEach(u->{ |
|
|
|
Map<Long, String> finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; |
|
|
|
list.stream().forEach(u->{ |
|
|
|
// u.setAddCredit(finalChaddMap.get(u.getId())); |
|
|
|
// u.setLesCredit(finalChlesMap.get(u.getId())); |
|
|
|
// if(StringUtils.isNotBlank(u.getTags())){ |
|
|
|
// List<Long> ids = JSONObject.parseArray(u.getTags(), Long.class); |
|
|
|
// if (null != ids) { |
|
|
|
// String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); |
|
|
|
// u.setTagNames(tagNames); |
|
|
|
// } |
|
|
|
if(StringUtils.isNotBlank(u.getTags())){ |
|
|
|
List<Long> ids = JSONObject.parseArray(u.getTags(), Long.class); |
|
|
|
if (null != ids) { |
|
|
|
String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); |
|
|
|
u.setTagNames(tagNames); |
|
|
|
} |
|
|
|
} |
|
|
|
// List<Long> ids = JSONObject.parseArray(finalUserTagsMap.get(u.getId()), Long.class); |
|
|
|
// if (null != ids) { |
|
|
|
// String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); |
|
|
|
// u.setTagNames(tagNames); |
|
|
|
// } |
|
|
|
//// List<Long> ids = JSONObject.parseArray(finalUserTagsMap.get(u.getId()), Long.class); |
|
|
|
//// if (null != ids) { |
|
|
|
//// String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); |
|
|
|
//// u.setTagNames(tagNames); |
|
|
|
//// } |
|
|
|
// }); |
|
|
|
}); |
|
|
|
// |
|
|
|
// } |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
|