diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java index 5af0d152..a4fa5cb5 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java @@ -200,6 +200,9 @@ public class BmsChannelController { param.forEach(a->{ a.setErrorInfo(""); + if(a.getType().equals("4")){ + return; + } if(!StringUtils.hasText(a.getChannelName())){ a.setErrorInfo(a.getErrorInfo()+"渠道名称不能为空;"); } @@ -227,6 +230,9 @@ public class BmsChannelController { List existSupplierName = supplierList.stream().map(a -> a.getName()).collect(Collectors.toList()); if (supplierList.size() < supplierNames.size()) { param.forEach(a -> { + if(a.getType().equals("4")){ + return; + } List noExistName = a.getSupplierNames().stream().filter(b -> !existSupplierName.contains(b)).collect(Collectors.toList()); if (noExistName.size() > 0) { a.setErrorInfo(a.getErrorInfo() + "不存在客户" + noExistName.stream().collect(Collectors.joining(",")) + ";"); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index 7aa214b2..757f5dcf 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -271,7 +271,11 @@ public class BmsChannelPointController { @PreAuthorize("hasRole('bms:channelPoint:insert')") public R importExcel(@RequestBody @Valid List param){ param.forEach(a->{ + a.setErrorInfo(""); + if(a.getType().equals("4")){ + return; + } if(!StringUtils.hasText(a.getChannelCode())){ a.setErrorInfo(a.getErrorInfo()+"渠道编码不能为空;"); } @@ -318,6 +322,9 @@ public class BmsChannelPointController { List existChannelCode = channelList.stream().map(a -> a.getChannelCode()).collect(Collectors.toList()); if(channelList.size() { + if(a.getType().equals("4")){ + return; + } if(!existChannelCode.contains(a.getChannelCode())){ a.setErrorInfo(a.getErrorInfo()+"不存在该渠道编码;"); } @@ -339,6 +346,9 @@ public class BmsChannelPointController { List existRegion2Code = region2List.stream().map(a -> a.getCode()).collect(Collectors.toList()); if(region2List.size() { + if(a.getType().equals("4")){ + return; + } if(!existRegion2Code.contains(a.getBizRegionCode())){ a.setErrorInfo(a.getErrorInfo()+"不存在该行政区域编码;"); }