修改导入拆分结果bug
This commit is contained in:
+2
-2
@@ -3186,7 +3186,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
}
|
}
|
||||||
if (sysDeparts.size() > 1) {
|
if (sysDeparts.size() > 1) {
|
||||||
// 叶子节点名称重复,需要寻找全路径
|
// 叶子节点名称重复,需要寻找全路径
|
||||||
String nodeId = departPartMap.get(value);
|
String nodeId = departPartMap.get(v);
|
||||||
if (StrUtil.isBlank(nodeId)) {
|
if (StrUtil.isBlank(nodeId)) {
|
||||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
|
||||||
errorMsg += fieldName + "中组织机构" + v + "不存在;";
|
errorMsg += fieldName + "中组织机构" + v + "不存在;";
|
||||||
@@ -3208,7 +3208,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
valueList = Collections.emptyList();
|
valueList = Collections.emptyList();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
String cellValue = this.convertMultiOrgId(value, departMap, departPartMap);
|
String cellValue = this.convertMultiOrgId(v, departMap, departPartMap);
|
||||||
valueList.add(cellValue);
|
valueList.add(cellValue);
|
||||||
|
|
||||||
// Optional<SysDepart> first = sysDepartList.stream().filter(o -> v.equals(o.getDepartName())).findFirst();
|
// Optional<SysDepart> first = sysDepartList.stream().filter(o -> v.equals(o.getDepartName())).findFirst();
|
||||||
|
|||||||
Reference in New Issue
Block a user