From 8d3fa24ec84373bd022eacde2d28bef8554c8ba9 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Tue, 20 May 2025 14:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EmployeeInformationServiceImpl.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
index a49f1aa..08ce0d0 100644
--- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
+++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeInformationServiceImpl.java
@@ -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){