From bb60bb03235c63f50b9e86f6616ce79d004843d7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Jun 2021 20:56:19 +0800 Subject: [PATCH] ceshi --- .../impl/WxCUserBasicInfoServiceImpl.java | 30 +++++++++---------- .../mapper/WxCUserBasicInfoMapper.xml | 4 +-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 8b08e7afa..e12403bc0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1385,28 +1385,28 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc //// //// } // -// List tagList = wxTagsMapper.findListAll(); + List tagList = wxTagsMapper.findListAll(); // // Map finalChaddMap = chaddMap; // Map finalChlesMap = chlesMap; //// Map finalUserTagsMap = userTagsMap; -// Map finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; -// list.stream().forEach(u->{ + Map 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 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 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 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 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 ) { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 139ff3515..d1ea35b30 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -650,7 +650,7 @@ distinct cu.`id`,cu.`phone`,cu.`birthdate`,cu.`education`,cu.`sex`,cu.`email`,cu.`address`,cu.`poins`,cu.`tag_id`, cu.`create_date`,cu.`update_date`,cu.`name`,cu.`level`,cu.`nick_name`, - + cut.`tags`, cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id` @@ -849,7 +849,7 @@ from wx_c_user_basic_info cu - + left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id` limit #{basicInfo.begin}, #{basicInfo.limit}