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

Merge pull request '岗位分权，部门列表，分部、部门导入BUG修复' (#151) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/151
This commit is contained in:
dxfeng 2023-02-07 14:43:52 +08:00
parent a1a91b2cb8 29e1ed93f6
commit f29ca425ec
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -130,7 +130,7 @@ public class JobBrowserService extends BrowserService {
// 分权
DetachUtil detachUtil = new DetachUtil(user);
if (detachUtil.isDETACH()) {
sqlWhere += " AND t.parent_comp in (" + detachUtil.getJclRoleLevels() + ")";
sqlWhere += " AND t.ec_company in (" + detachUtil.getJclRoleLevels() + ")";
}
return sqlWhere;
}

2
src/com/engine/organization/entity/department/bo/DepartmentBO.java
View File

@ -159,7 +159,7 @@ public class DepartmentBO {
return "";
}
String departmentPrincipal = MapperProxyFactory.getProxy(DepartmentMapper.class).getDepartmentPrincipal(id);
if (StringUtils.isBlank(departmentPrincipal)) {
if (StringUtils.isBlank(departmentPrincipal) || "$NULL$".equalsIgnoreCase(departmentPrincipal)) {
return "";
}
List<Long> collect = Arrays.stream(departmentPrincipal.split(",")).map(Long::parseLong).collect(Collectors.toList());

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 + "转换失败");