|
@@ -802,6 +802,7 @@ public class AdminWebsitLogic {
|
|
|
List<Object> row = new ArrayList<>();
|
|
|
|
|
|
final AdminCompanyWechatPayConfig wechatPayConfig = wechatPayConfigMap.get(websit.getPayWorkerCodeId());
|
|
|
+ row.add(websit.getWebsitId());
|
|
|
row.add(websit.getName());
|
|
|
row.add(websit.getLinkName());
|
|
|
row.add(websit.getAddress());
|
|
@@ -812,7 +813,6 @@ public class AdminWebsitLogic {
|
|
|
final List<AdminWebsitPayConfig> items = itemMap.get(websit.getWebsitId());
|
|
|
if (CollectionUtil.isNotEmpty(items)) {
|
|
|
for (AdminWebsitPayConfig item : items) {
|
|
|
- row.add(item.getWebsitId());
|
|
|
row.add(item.getName());
|
|
|
row.add(item.getOrgId());
|
|
|
row.add(item.getType().equals(WebsitGoodsTypeEnum.M.getKey()) ? WebsitGoodsTypeEnum.M.getRemark() : WebsitGoodsTypeEnum.P.getRemark());
|