liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分部、部门导入BUG修复

This commit is contained in:
dxfeng 2023-02-07 14:41:31 +08:00
parent 559ea407ab
commit eaca9535d5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/organization/util/saveimport/CompanyImport.java
View File

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

8
src/com/engine/organization/util/saveimport/DepartmentImport.java
View File

@ -124,8 +124,8 @@ public class DepartmentImport {
value += SystemEnv.getHtmlLabelName(28576, user.getLanguage());
item.put("link", templatePath);
}
if(3==i){
value = value.replace("及显示顺序","");
if (3 == i) {
value = value.replace("及显示顺序", "");
}
item.put("value", value);
itemList.add(item);
@ -206,8 +206,10 @@ public class DepartmentImport {
try {
if ("departmentmark".equalsIgnoreCase(infoPO.getFieldName()) || "subcompanyid1".equalsIgnoreCase(infoPO.getFieldName())) {
reallyValue = cellValue;
} else if (StringUtils.isBlank(cellValue)) {
reallyValue = "";
} else {
reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem());
}
} catch (Exception e) {
historyDetailPO.setOperateDetail(cellValue + "转换失败");