diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
index 473eba426..2db8986ab 100644
--- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
@@ -5,6 +5,7 @@ import com.api.browser.bean.SearchConditionItem;
 import com.api.browser.bean.SearchConditionOption;
 import com.api.browser.util.ConditionFactory;
 import com.api.browser.util.ConditionType;
+import com.api.formmode.mybatis.util.SqlProxyHandle;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.biz.AddUpSituationBiz;
@@ -23,10 +24,9 @@ import com.engine.salary.entity.taxagent.po.TaxAgentPO;
 import com.engine.salary.enums.UserStatusEnum;
 import com.engine.salary.exception.SalaryRunTimeException;
 import com.engine.salary.mapper.datacollection.AddUpSituationMapper;
-import com.engine.salary.service.AddUpDeductionService;
-import com.engine.salary.service.AddUpSituationService;
-import com.engine.salary.service.SalaryEmployeeService;
-import com.engine.salary.service.TaxAgentService;
+import com.engine.salary.mapper.sys.SalarySysConfMapper;
+import com.engine.salary.service.*;
+import com.engine.salary.sys.entity.po.SalarySysConfPO;
 import com.engine.salary.util.SalaryDateUtil;
 import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
@@ -76,6 +76,13 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
 
     AddUpSituationBiz biz = new AddUpSituationBiz();
 
+    private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) {
+        return (SalaryAcctEmployeeService) ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user);
+    }
+
+    private SalarySysConfMapper getSalarySysConfMapper() {
+        return SqlProxyHandle.getProxy(SalarySysConfMapper.class);
+    }
 
     @Override
     public Map<String, Object> getSearchCondition() {
@@ -547,6 +554,10 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
         EmployBiz employBiz = new EmployBiz();
         AddUpSituationBiz biz = new AddUpSituationBiz();
 
+        //查询对于人员信息导入筛选的全局配置
+        SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode");
+        String confValue = (salarySysConfPO != null && salarySysConfPO.getConfValue() != null && !"".equals(salarySysConfPO.getConfValue())) ? salarySysConfPO.getConfValue() : "0";
+
         //检验参数
         checkImportParam(importParam);
 
@@ -615,13 +626,13 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
                 String userName = dto.getUsername();
                 String deparmentName = dto.getDepartmentName();
                 String mobile = dto.getMobile();
-                List<DataCollectionEmployee> employeeSameIds = employees.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName))
-                        && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName))
-                        && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile)))
-                        .collect(Collectors.toList());
+                String workcode = dto.getJobNum();
 
+                //筛选导入人员信息可以在人力资源池中匹配到的人员信息
+                List<DataCollectionEmployee> employeeSameIds = getSalaryAcctEmployeeService(user).matchImportEmployee(employees, userName, deparmentName, mobile, workcode);
 
-                if (StringUtils.isBlank(userName)) {
+                //当人员信息导入筛选的全局配置为"0"时，姓名才是必填项
+                if (StringUtils.isBlank(userName) && "0".equals(confValue)) {
                     //姓名 不能为空
                     //错误消息对象
                     Map<String, String> errorMessageMap = Maps.newHashMap();
diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
index 46bad85c0..b1c2a8440 100644
--- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
@@ -245,7 +245,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
                             .collect(Collectors.toList());
                 }
 
-
+                //当人员信息导入筛选的全局配置为"0"时，姓名才是必填项
                 if (StringUtils.isBlank(userName) && "0".equals(confValue)) {
                     //姓名 不能为空
                     //错误消息对象
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 596b8c86b..53d8de902 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -1166,11 +1166,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                         }
                     }
 
-//                    else if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(86184, "部门"), dataKey.toString())) {
-//
-//                    } else if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), dataKey.toString())) {
-//
-//                    }
 
                 }