From bfd4ded5aaf7fcead591435d504bea9105d2fd2e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 12 五月 2021 12:40:31 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index a23a0c4..217d69f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -75,7 +75,7 @@
queryWrapper.like("a.CertificateNumb", empUnemployment.getCertificateNumb());
}
if (StringUtils.isNotBlank(empUnemployment.getDeptName())) {
- queryWrapper.like("a.DeptName", empUnemployment.getDeptName());
+ queryWrapper.like("b.allDeptName", empUnemployment.getDeptName());
}
if (StringUtils.isNotBlank(empUnemployment.getApplayDateStr())) {
queryWrapper.between("a.ApplayDate", empUnemployment.getApplayDateStr().split(",")[0], empUnemployment.getApplayDateStr().split(",")[1]);
@@ -192,7 +192,7 @@
returnList.add(StrUtil.format("导入失业金领取异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empUnemployment.setDelFlag(2);
+ empUnemployment.setDelFlag(0);
empUnemployment.setEmpId(empId);
empUnemployment.setDeptName(list.get(1).toString());
empUnemployment.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0