From f33993d5804b90abf600477d228c9fd5b2bbd50a Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 22 Sep 2020 14:48:02 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/mapper/WxCUserTagsMapper.java | 2 -- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 7 +++++-- .../src/main/resources/mapper/WxCUserTagsMapper.xml | 6 ------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java index 4fc38952d..99b983566 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java @@ -17,6 +17,4 @@ public interface WxCUserTagsMapper extends CommonMapper { @Param("startTime")Date startTime,@Param("endTime")Date endTime); void updateNewId(CUserTagNewIdVo record); - - Map findUserTagsMap(WxCUserTags wxCUserTags); } 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 c7091069f..80e6231ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1236,10 +1236,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc if (null != userIds ) { WxCUserTags tq = new WxCUserTags(); tq.setUserIds(userIds); - Map userTagsMap = wxCUserTagsMapper.findUserTagsMap(tq); - if (null != userTagsMap) { + List userTagList = wxCUserTagsMapper.findList(tq); + if (null != userTagList) { List tagList = wxTagsMapper.findListAll(); Map tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); + + Map userTagsMap = userTagList.stream().collect(Collectors.toMap(WxCUserTags::getUserId, WxCUserTags::getTags)); + list.stream().forEach(u->{ List ids = JSONObject.parseArray(userTagsMap.get(u.getId()), Long.class); if (null != ids) { diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index c78c29e93..6f8ec4293 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -95,12 +95,6 @@ - -