修改导入拆分条款bug
This commit is contained in:
+6
-8
@@ -3233,9 +3233,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
}
|
}
|
||||||
if(CollectionUtils.isEmpty(valueList)){
|
if(CollectionUtils.isEmpty(valueList)){
|
||||||
valueList = new ArrayList<>();
|
valueList = new ArrayList<>();
|
||||||
valueList.add(path.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 + "存在多个;";
|
||||||
@@ -3246,12 +3245,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
if(CollectionUtils.isEmpty(valueList)){
|
|
||||||
valueList = new ArrayList<>();
|
|
||||||
valueList.add(path.get(0).getItemValue());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if(CollectionUtils.isEmpty(valueList)){
|
||||||
|
valueList = new ArrayList<>();
|
||||||
|
}
|
||||||
|
valueList.add(path.get(0).getItemValue());
|
||||||
}else {
|
}else {
|
||||||
List<SysDictItem> sysDictItemList = getLevelPath(sysDictItemLists);
|
List<SysDictItem> sysDictItemList = getLevelPath(sysDictItemLists);
|
||||||
List<SysDictItem> pathOther =
|
List<SysDictItem> pathOther =
|
||||||
@@ -3270,8 +3268,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
}
|
}
|
||||||
if(CollectionUtils.isEmpty(valueList)){
|
if(CollectionUtils.isEmpty(valueList)){
|
||||||
valueList = new ArrayList<>();
|
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 + "不存在;";
|
||||||
|
|||||||
Reference in New Issue
Block a user