QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改条款导入

Browse Source
This commit is contained in:
梁琦涛
2024-09-24 14:25:31 +08:00
parent 6aed2fbe35
commit b8bbe72e7c
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+23 -11
View File
@@ -3184,7 +3184,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} }
countError++; countError++;
valueList = Collections.emptyList(); valueList = Collections.emptyList();
continue; break;
}else { }else {
valueList.add(first.get().getId()); valueList.add(first.get().getId());
} }
@@ -3221,7 +3221,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!pathOther.isEmpty()){ if(!pathOther.isEmpty()){
if (path.size() > 1) { if (pathOther.size() > 1) {
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
countError++; countError++;
@@ -3229,9 +3229,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;"; errorMsg += fieldName + " " + treePath + "Exist in multiple;";
} }
continue; break;
} }
valueList.add(pathOther.get(0).getItemValue()); if(CollectionUtils.isEmpty(valueList)){
valueList = new ArrayList<>();
valueList.add(path.get(0).getItemValue());
}
}else{ }else{
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
@@ -3240,7 +3244,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + treePath + "Not exist;"; errorMsg += fieldName + " " + treePath + "Not exist;";
} }
continue; break;
}
}else{
if(CollectionUtils.isEmpty(valueList)){
valueList = new ArrayList<>();
valueList.add(path.get(0).getItemValue());
} }
} }
}else { }else {
@@ -3249,7 +3258,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath())) sysDictItemList.stream().filter(o -> treePath.equals(o.getLevelPath()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if(!pathOther.isEmpty()){ if(!pathOther.isEmpty()){
if (path.size() > 1) { if (pathOther.size() > 1) {
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "存在多个；"; errorMsg += fieldName + "中" + treePath + "存在多个；";
countError++; countError++;
@@ -3257,9 +3266,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;"; errorMsg += fieldName + " " + treePath + "Exist in multiple;";
} }
continue; break;
}
if(CollectionUtils.isEmpty(valueList)){
valueList = new ArrayList<>();
valueList.add(pathOther.get(0).getItemValue());
} }
valueList.add(pathOther.get(0).getItemValue());
}else{ }else{
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
errorMsg += fieldName + "中" + treePath + "不存在；"; errorMsg += fieldName + "中" + treePath + "不存在；";
@@ -3268,7 +3280,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + treePath + "Not exist;"; errorMsg += fieldName + " " + treePath + "Not exist;";
} }
continue; break;
} }
} }
} }
@@ -3291,7 +3303,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + treePath + "Exist in multiple;"; errorMsg += fieldName + " " + treePath + "Exist in multiple;";
} }
continue; break;
} }
valueList.add(path.get(0).getCode()); valueList.add(path.get(0).getCode());
}else { }else {
@@ -3302,7 +3314,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
} else { } else {
errorMsg += fieldName + " " + treePath + "Not exist;"; errorMsg += fieldName + " " + treePath + "Not exist;";
} }
continue; break;
} }
} }
} }