|
@@ -74,6 +74,7 @@ public class SettleRelaConfigLogic {
|
|
|
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);
|
|
@@ -137,7 +138,7 @@ public class SettleRelaConfigLogic {
|
|
|
item.setCompanyWechatId(config.getCompanyWechatId())
|
|
|
.setCompanyWechatName(config.getCompanyWechatName())
|
|
|
.setParentId(config.getWebsitId())
|
|
|
- .setSubWebsitId(itemBean.getSubWebsitId());
|
|
|
+ .setSubWebsitId(StringUtils.isBlank(itemBean.getWebsitId()) ? itemBean.getSubWebsitId() : itemBean.getWebsitId());
|
|
|
items.add(item);
|
|
|
}
|
|
|
websitFollowConfigItemService.saveBatch(items);
|
|
@@ -179,7 +180,7 @@ public class SettleRelaConfigLogic {
|
|
|
item.setCompanyWechatId(config.getCompanyWechatId())
|
|
|
.setCompanyWechatName(config.getCompanyWechatName())
|
|
|
.setParentId(config.getWebsitId())
|
|
|
- .setSubWebsitId(itemBean.getSubWebsitId());
|
|
|
+ .setSubWebsitId(StringUtils.isBlank(itemBean.getWebsitId()) ? itemBean.getSubWebsitId() : itemBean.getWebsitId());
|
|
|
items.add(item);
|
|
|
}
|
|
|
websitFollowConfigItemService.saveBatch(items);
|