|
|
|
@@ -1232,10 +1232,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
} |
|
|
|
list = wxCUserBasicInfoMapper.findVoList(basicInfo); |
|
|
|
if (null == list || list.size() <= 0 ) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo); |
|
|
|
if (null != userIds ) { |
|
|
|
if (null != userIds && userIds.size() > 0 ) { |
|
|
|
WxCUserTags tq = new WxCUserTags(); |
|
|
|
tq.setUserIds(userIds); |
|
|
|
tq.setUserIdList(userIds); |
|
|
|
List<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq); |
|
|
|
if (null != userTagList) { |
|
|
|
List<WxTags> tagList = wxTagsMapper.findListAll(); |
|
|
|
@@ -1253,7 +1256,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
if (null != list ) { |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
List<Object> retList = new ArrayList<Object>(); |
|
|
|
retList.addAll(list); |
|
|
|
return retList; |
|
|
|
|