diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java index c59625d7e..1cf7f1def 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java @@ -56,9 +56,9 @@ public interface WxCUserTagsService { /** * 获取标签id------标签name map - * @param tenantInfo + * @param tenantId * @param tagIds * @return */ - Map findIdTagNames(TenantEntity tenantInfo, List tagIds); + Map findIdTagNames(String tenantId, List tagIds); } 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 dce00daef..3019c2287 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -823,6 +823,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc // String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); // u.setTagNames(tagNames); // }); + excelService.exportBigExcel(this,basicInfo, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); } @@ -1244,14 +1245,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Override public List selectListForExcelExport(Object queryParams, int page) { - Map params = (Map) queryParams; - WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) params.get("basicInfo"); - TenantEntity tenantInfo = (TenantEntity) params.get("tenantInfo"); + WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) queryParams; List list = new ArrayList(); basicInfo.setBegin((page-1)*20000); basicInfo.setLimit(20000); - basicInfo.undateFinalTenantId(tenantInfo); list = wxCUserBasicInfoMapper.findVoList(basicInfo); if (null == list || list.size() <= 0 ) { return null; @@ -1283,7 +1281,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc //处理会员标签 List tagIds = list.stream().map(cc -> cc.getTagId()).collect(Collectors.toList()); - Map tagIdName = wxCUserTagsService.findIdTagNames(tenantInfo,tagIds); + Map tagIdName = wxCUserTagsService.findIdTagNames(basicInfo.getFinalTenantId(),tagIds); list.stream().forEach(u->{ // u.setAddCredit(finalChaddMap.get(u.getId())); // u.setLesCredit(finalChlesMap.get(u.getId())); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 5f4786e14..720e5ce0f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -331,17 +331,17 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } @Override - public Map findIdTagNames(TenantEntity tenantInfo, List tagIds) { + public Map findIdTagNames(String tenantId, List tagIds) { Map tagIdName = new HashMap<>(); if(tagIds == null || tagIds.isEmpty()){ return tagIdName; } WxCUserTags userTagsQ = new WxCUserTags(); - userTagsQ.updateTenantInfo(tenantInfo); + userTagsQ.setTenantId(tenantId); userTagsQ.setIds(tagIds); List userTagsList = wxCUserTagsMapper.findList(userTagsQ); - List tagList = wxTagsMapper.findListAll(tenantInfo.getTenantId()); + List tagList = wxTagsMapper.findListAll(tenantId); Map finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); for (WxCUserTags wct:userTagsList) { if(StringUtils.isNotBlank(wct.getTags())){