Преглед изворни кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_03

release_toaliyun_real
xhxu пре 4 година
родитељ
комит
5a2f0198c9
1 измењених фајлова са 3 додато и 3 уклоњено
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Прегледај датотеку

@@ -446,7 +446,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
}); });
if(!tagIdList.isEmpty()){ if(!tagIdList.isEmpty()){
String tagCodes = JSON.toJSONString(tagIdList); String tagCodes = JSON.toJSONString(tagIdList);
List<Long> tagIds = wxCUserTagsMapper.findIdList(tenantEntity.getTenantId(),tagCodes);
List<Long> tagIds = wxCUserTagsMapper.findIdList(tenantEntity.getFinalTenantId(),tagCodes);
if(tagIds != null && tagIds.size() > 0){ if(tagIds != null && tagIds.size() > 0){
dto.setTagIds(tagIds); dto.setTagIds(tagIds);
}else{ }else{
@@ -543,7 +543,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
if(wxCUserBasicInfoDto.getId() != null && wxCUserBasicInfoDto.getId() == -999l){ if(wxCUserBasicInfoDto.getId() != null && wxCUserBasicInfoDto.getId() == -999l){
return 0l; return 0l;
} }
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setTenantId(tenantEntity.getTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto); return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto);
} }
@@ -554,7 +554,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
if(wxCUserBasicInfoDto.getId() != null && wxCUserBasicInfoDto.getId() == -999l){ if(wxCUserBasicInfoDto.getId() != null && wxCUserBasicInfoDto.getId() == -999l){
return new ArrayList<WxCUserBasicInfo>(); return new ArrayList<WxCUserBasicInfo>();
} }
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId());
wxCUserBasicInfoDto.setTenantId(tenantEntity.getTenantId());
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId());
return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto); return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto);
} }


Loading…
Откажи
Сачувај