认证-参数项-导入提示语bug55489
This commit is contained in:
+6
-2
@@ -1409,7 +1409,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
|||||||
if (ccDtoAfterDistinct.size() < ccDtoList.size()) {
|
if (ccDtoAfterDistinct.size() < ccDtoList.size()) {
|
||||||
// 取差集
|
// 取差集
|
||||||
String reduceOne = ccDtoList.stream()
|
String reduceOne = ccDtoList.stream()
|
||||||
.filter(e->!ccDtoAfterDistinct.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(","));
|
.filter(e->!ccDtoAfterDistinct.contains(e))
|
||||||
|
.map(CertCategoryParamsInfoCnImport::getNioNumber).distinct()
|
||||||
|
.collect(Collectors.joining(","));
|
||||||
if (StringUtils.isNotBlank(reduceOne)) {
|
if (StringUtils.isNotBlank(reduceOne)) {
|
||||||
if (CutEnum.CN.getValue().equals(cut)) {
|
if (CutEnum.CN.getValue().equals(cut)) {
|
||||||
stringMessage.add("导入数据中NIO编号:" + reduceOne + "下存在重复认证类别;");
|
stringMessage.add("导入数据中NIO编号:" + reduceOne + "下存在重复认证类别;");
|
||||||
@@ -1428,7 +1430,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
|||||||
if (ccDtoAfterDistinctTwo.size() < certCategoryParamsInfoEOList.size()) {
|
if (ccDtoAfterDistinctTwo.size() < certCategoryParamsInfoEOList.size()) {
|
||||||
// 取差集
|
// 取差集
|
||||||
String reduceTwo = certCategoryParamsInfoEOList.stream()
|
String reduceTwo = certCategoryParamsInfoEOList.stream()
|
||||||
.filter(e->!ccDtoAfterDistinctTwo.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(","));
|
.filter(e->!ccDtoAfterDistinctTwo.contains(e))
|
||||||
|
.map(CertCategoryParamsInfoCnImport::getNioNumber).distinct()
|
||||||
|
.collect(Collectors.joining(","));
|
||||||
if (StringUtils.isNotBlank(reduceTwo)) {
|
if (StringUtils.isNotBlank(reduceTwo)) {
|
||||||
if (CutEnum.CN.getValue().equals(cut)) {
|
if (CutEnum.CN.getValue().equals(cut)) {
|
||||||
stringMessage.add("导入数据中NIO编号:" + reduceTwo + "下存在重复认证编号;");
|
stringMessage.add("导入数据中NIO编号:" + reduceTwo + "下存在重复认证编号;");
|
||||||
|
|||||||
Reference in New Issue
Block a user