薪资导出

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -147,12 +147,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				Map<String, TSalaryEmployee> empNameMap = new HashMap<>();
 				boolean isDuplicateName = false;
 				if (empList != null) {
-					TSalaryEmployee es;//筛选人员，添加判断：非在职，或开户行为空，或 结算主体等于选择的结算主体且在职，都可以存入Map优先备用
+					TSalaryEmployee es;
+					//  筛选人员，添加判断：非在职，或开户行为空，或 结算主体等于选择的结算主体且在职，都可以存入Map优先备用
+					// 2022-10-18 17:14:37 hgw变更：开户行省不为空且是导入部门，优先取用
 					for (TSalaryEmployee e : empList) {
 						es = empIdCardMap.get(e.getEmpIdcard());
-						if (es == null || !CommonConstants.ZERO_STRING.equals(es.getFileStatus()) || Common.isEmpty(es.getBankName())
-								|| (e.getDeptId().equals(settleDepart) && CommonConstants.ZERO_STRING.equals(e.getFileStatus())
-								&& Common.isNotNull(e.getBankName()))) {
+						if (es == null || (e.getDeptId().equals(settleDepart) && Common.isNotNull(e.getBankProvince()))) {
 							empIdCardMap.put(e.getEmpIdcard(), e);
 							empNameMap.put(e.getEmpName().replace(" ", ""), e);
 						}