fix 拆分导入失败
This commit is contained in:
+10
-10
@@ -3191,7 +3191,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
errorMsg += fieldName + " " + v + "Not exist;";
|
errorMsg += fieldName + " " + v + "Not exist;";
|
||||||
}
|
}
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3202,7 +3202,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
errorMsg += fieldName + " " + v + "Not exist;";
|
errorMsg += fieldName + " " + v + "Not exist;";
|
||||||
}
|
}
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
String cellValue = this.convertMultiOrgId(v, departMap, departPartMap);
|
String cellValue = this.convertMultiOrgId(v, departMap, departPartMap);
|
||||||
@@ -3213,7 +3213,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
errorMsg += fieldName + " " + v + "Not exist;";
|
errorMsg += fieldName + " " + v + "Not exist;";
|
||||||
}
|
}
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
valueList.add(cellValue);
|
valueList.add(cellValue);
|
||||||
@@ -3226,7 +3226,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
// errorMsg += fieldName + " " + v + "Not exist;";
|
// errorMsg += fieldName + " " + v + "Not exist;";
|
||||||
// }
|
// }
|
||||||
// countError++;
|
// countError++;
|
||||||
// valueList = Collections.emptyList();
|
// valueList = new ArrayList<>();
|
||||||
// break;
|
// break;
|
||||||
// }else {
|
// }else {
|
||||||
// valueList.add(first.get().getId());
|
// valueList.add(first.get().getId());
|
||||||
@@ -3268,7 +3268,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
|
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
|
||||||
}
|
}
|
||||||
@@ -3282,7 +3282,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
errorMsg += fieldName + " " + treePath + "Not exist;";
|
errorMsg += fieldName + " " + treePath + "Not exist;";
|
||||||
}
|
}
|
||||||
@@ -3303,7 +3303,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
|
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
|
||||||
}
|
}
|
||||||
@@ -3317,7 +3317,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中" + treePath + "不存在;";
|
errorMsg += fieldName + "中" + treePath + "不存在;";
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
errorMsg += fieldName + " " + treePath + "Not exist;";
|
errorMsg += fieldName + " " + treePath + "Not exist;";
|
||||||
}
|
}
|
||||||
@@ -3340,7 +3340,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
errorMsg += fieldName + "中" + treePath + "存在多个;";
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
|
errorMsg += fieldName + " " + treePath + "Exist in multiple;";
|
||||||
}
|
}
|
||||||
@@ -3351,7 +3351,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中" + treePath + "不存在;";
|
errorMsg += fieldName + "中" + treePath + "不存在;";
|
||||||
countError++;
|
countError++;
|
||||||
valueList = Collections.emptyList();
|
valueList = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
errorMsg += fieldName + " " + treePath + "Not exist;";
|
errorMsg += fieldName + " " + treePath + "Not exist;";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user