Commit 3b00bf89 by 吴博

Merge branch 'fixbug/1007376-1' into 'release'

Fixbug/1007376 1

See merge request rays/pcloud-book!1613
parents 20548a3e 6ff96247
......@@ -176,12 +176,10 @@ public class MultiChannelContentBizImpl implements MultiChannelContentBiz {
if (CollUtil.isNotEmpty(itemDTOMap.get(e.getId()))) {
multiChannelContentItems.addAll(itemDTOMap.get(e.getId()));
e.setMultiChannelContentItems(multiChannelContentItems);
multiChannelContentDTOS.add(e);
}
});
}
if (CollUtil.isNotEmpty(multiChannelContentDTOS4Bili)) {
multiChannelContentDTOS.addAll(multiChannelContentDTOS4Bili);
}
return multiChannelContentDTOS;
}
......@@ -205,12 +203,10 @@ public class MultiChannelContentBizImpl implements MultiChannelContentBiz {
if (CollUtil.isNotEmpty(itemDTOMap.get(e.getId()))) {
multiChannelContentItems.addAll(itemDTOMap.get(e.getId()));
e.setMultiChannelContentItems(multiChannelContentItems);
multiChannelContentDTOS.add(e);
}
});
}
if (CollUtil.isNotEmpty(multiChannelContentDTOS4Douyin)) {
multiChannelContentDTOS.addAll(multiChannelContentDTOS4Douyin);
}
return multiChannelContentDTOS;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment