Commit 6b66ad10 by 吴博

fix

parent 54098ff1
...@@ -914,14 +914,12 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -914,14 +914,12 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
if (ListUtils.isEmpty(list)) { if (ListUtils.isEmpty(list)) {
return new ArrayList<>(); return new ArrayList<>();
} }
//先获取阅读计划,若阅读计划为空则推资讯 list = setAppletNews4Week(rightsSettingId, rightsType, wechatUserId, list);
List<Long> rightsSettingItemIds = List<Long> rightsSettingItemIds =
list.stream().filter(e -> YesOrNoEnums.YES.getValue().equals(e.getIsOpen())).map(e -> e.getId()).collect(Collectors.toList()); list.stream().filter(e -> YesOrNoEnums.YES.getValue().equals(e.getIsOpen())).map(e -> e.getId()).collect(Collectors.toList());
if (!ListUtils.isEmpty(rightsSettingItemIds)) { if (!ListUtils.isEmpty(rightsSettingItemIds)) {
List<RightsCustomRelation> rightsCustomRelations = rightsCustomRelationDao.getCustomByItemIds(rightsSettingItemIds); List<RightsCustomRelation> rightsCustomRelations = rightsCustomRelationDao.getCustomByItemIds(rightsSettingItemIds);
list = setReadPlan4Week(rightsCustomRelations, list); list = setReadPlan4Week(rightsCustomRelations, list);
} else {
list = setAppletNews4Week(rightsSettingId, rightsType, wechatUserId, list);
} }
return list; return list;
} }
......
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