|
|
@@ -70,14 +70,16 @@ public class SettleRelaConfigLogic {
|
|
|
|
|
|
List<WebsitFollowConfigItemBean> beanList = new ArrayList<>();
|
|
|
for (WebsitFollowConfigItem item : items) {
|
|
|
- final AdminWebsit websit = websitMap.get(item.getSubWebsitId());
|
|
|
- WebsitFollowConfigItemBean itemBean = new WebsitFollowConfigItemBean();
|
|
|
- BeanUtils.copyProperties(item, itemBean);
|
|
|
- itemBean.setName(websit.getName());
|
|
|
- itemBean.setWebsitId(item.getSubWebsitId());
|
|
|
- itemBean.setBelongCompany(websit.getBelongCompany());
|
|
|
- itemBean.setBelongCompanyCode(websit.getBelongCompanyCode());
|
|
|
- beanList.add(itemBean);
|
|
|
+ if (websitMap.containsKey(item.getSubWebsitId())) {
|
|
|
+ final AdminWebsit websit = websitMap.get(item.getSubWebsitId());
|
|
|
+ WebsitFollowConfigItemBean itemBean = new WebsitFollowConfigItemBean();
|
|
|
+ BeanUtils.copyProperties(item, itemBean);
|
|
|
+ itemBean.setName(websit.getName());
|
|
|
+ itemBean.setWebsitId(item.getSubWebsitId());
|
|
|
+ itemBean.setBelongCompany(websit.getBelongCompany());
|
|
|
+ itemBean.setBelongCompanyCode(websit.getBelongCompanyCode());
|
|
|
+ beanList.add(itemBean);
|
|
|
+ }
|
|
|
}
|
|
|
bean.setItems(beanList);
|
|
|
}
|