|
|
@ -206,8 +206,10 @@ public class DepartmentImport {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
if ("departmentmark".equalsIgnoreCase(infoPO.getFieldName()) || "subcompanyid1".equalsIgnoreCase(infoPO.getFieldName())) {
|
|
|
|
if ("departmentmark".equalsIgnoreCase(infoPO.getFieldName()) || "subcompanyid1".equalsIgnoreCase(infoPO.getFieldName())) {
|
|
|
|
reallyValue = cellValue;
|
|
|
|
reallyValue = cellValue;
|
|
|
|
|
|
|
|
} else if (StringUtils.isBlank(cellValue)) {
|
|
|
|
|
|
|
|
reallyValue = "";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
|
|
|
|
reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (Exception e) {
|
|
|
|
} catch (Exception e) {
|
|
|
|
historyDetailPO.setOperateDetail(cellValue + "转换失败");
|
|
|
|
historyDetailPO.setOperateDetail(cellValue + "转换失败");
|
|
|
|