xuxy
/
jucailin_eb_product
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步字段

This commit is contained in:
liuliang 2025-05-20 14:58:30 +08:00
parent 3b5d3fae03
commit 8d3fa24ec8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
View File

@ -503,8 +503,8 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic
List<Map<Object, Object>> personCustomFieldList = getFieldList(personCustomEntity,employee);
List<Map<Object, Object>> customFieldList = personCustomFieldList.stream().filter(e->!e.get("componentKey").equals("BaseField")).collect(Collectors.toList());
List<Map<Object, Object>> customMainFieldList = customFieldList.stream().filter(e->CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
List<Map<Object, Object>> customDetailFieldList = customFieldList.stream().filter(e->!CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
List<Map<Object, Object>> customMainFieldList = personCustomFieldList.stream().filter(e->CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
List<Map<Object, Object>> customDetailFieldList = personCustomFieldList.stream().filter(e->!CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
/**
* 人力资源-个人信息自定义字段
*/
@ -512,8 +512,8 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic
List<Map<Object, Object>> personInfCustomFieldList = getFieldList(personInfCustomEntity,employee);
List<Map<Object, Object>> infcustomFieldList = personInfCustomFieldList.stream().filter(e->!e.get("componentKey").equals("BaseField")).collect(Collectors.toList());
List<Map<Object, Object>> infcustomMainFieldList = infcustomFieldList.stream().filter(e->CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
List<Map<Object, Object>> infcustomDetailFieldList = infcustomFieldList.stream().filter(e->!CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
List<Map<Object, Object>> infcustomMainFieldList = personInfCustomFieldList.stream().filter(e->CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
List<Map<Object, Object>> infcustomDetailFieldList = personInfCustomFieldList.stream().filter(e->!CommonUtils.null2String(e.get("subFormId")).equals("")).collect(Collectors.toList());
//组装员工信息
@ -1079,6 +1079,10 @@ public class EmployeeInformationServiceImpl implements EmployeeInformationServic
for (Map<Object, Object> customField:conditionList){
List<Map<Object, Object>> list = Lists.newArrayList();
if (!"-1".equals(groupId) && customField.get("componentKey").equals("BaseField")){
//过滤系统的基础字段
continue;
}
if ("-1".equals(groupId)){
//组装人力资源系统表，packageList为人力资源数据，conditionList为员工信息数据
for (Map<Object, Object> packageMap :packageList){