xhxu 5 лет назад
Родитель
Сommit
bb60bb0323
2 измененных файлов: 17 добавлений и 17 удалений
  1. +15
    -15
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 15
- 15
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Просмотреть файл

@@ -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 ) {


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -650,7 +650,7 @@
<sql id="allVoColumns">
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`,-->
cut.`tags`,
cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id`
</sql>

@@ -849,7 +849,7 @@
<!-- and credit.create_date &lt; #{basicInfo.creditEndTime}-->
<!-- </if>) as lesCredit-->
from wx_c_user_basic_info cu
<!-- left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id`-->
left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id`
<include refid="dynamicVoWhereConditions1"/>
<if test=" null != basicInfo.begin ">
limit #{basicInfo.begin}, #{basicInfo.limit}


Загрузка…
Отмена
Сохранить