diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java index fcc6477f2..b6586ebba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java @@ -55,19 +55,15 @@ public class WxMerchantRelationServiceImpl implements WxMerchantRelationService List finalList = list; List collected = ids.parallelStream().filter(x -> !finalList.contains(x)).collect(Collectors.toList()); - //1-新增 2-修改 - if (type == 1) { - //选择就插入 - insertInfo(regionId, ids, tenantId); - return new ResultData(Result.SUCCESS, "新增成功", null); - } else if (type == 2) { + + if (!CollectionUtils.isEmpty(list)) { wxMerchantRelationMapper.updateByMerchantIds(list); - if (!CollectionUtils.isEmpty(collected)){ - insertInfo(regionId, collected, tenantId); - } - return new ResultData(Result.SUCCESS, "编辑成功", null); } - return null; + + if (!CollectionUtils.isEmpty(collected)) { + insertInfo(regionId, collected, tenantId); + } + return new ResultData(Result.SUCCESS, "编辑成功", null); } public void insertInfo(Long regionId, List ids, String tenantId) { @@ -77,7 +73,6 @@ public class WxMerchantRelationServiceImpl implements WxMerchantRelationService relation.setId(IdWorker.get().nextId()); relation.setMerchantId(id); relation.setRegionMerchantId(regionId); - relation.setIsDel(0); relation.setTenantId(tenantId); list.add(relation); }