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/EmpRemarkInfoServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index c42219a..d3d5326 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -68,9 +68,13 @@
if (StringUtils.isNotBlank(empRemarkinfo.getCertificateNumb())) {
queryWrapper.like("a.CertificateNumb", empRemarkinfo.getCertificateNumb());
}
- if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
- queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
+ if (StringUtils.isNotBlank(empRemarkinfo.getAllDeptName())) {
+ queryWrapper.like("b.allDeptName", empRemarkinfo.getAllDeptName());
}
+
+ if (StringUtils.isNotBlank(empRemarkinfo.getDeptName())) {
+ queryWrapper.like("a.DeptName", empRemarkinfo.getDeptName());
+ }
if (StringUtils.isNotBlank(empRemarkinfo.getRemarkDateStr())) {
queryWrapper.between("a.RemarkDate", empRemarkinfo.getRemarkDateStr().split(",")[0],
empRemarkinfo.getRemarkDateStr().split(",")[1]);
@@ -83,7 +87,7 @@
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
- SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
+ SortUtil.handlePageSort(request, page, "remarkDate", FebsConstant.ORDER_ASC, true);
return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
}
@@ -171,7 +175,7 @@
returnList.add(StrUtil.format("导入员工备注信息服务异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
continue;
}
- empRemarkinfo.setDelFlag(2);
+ empRemarkinfo.setDelFlag(0);
empRemarkinfo.setEmpId(empId);
empRemarkinfo.setDeptName(list.get(1).toString());
empRemarkinfo.setDeptId(dept.getDeptId());
--
Gitblit v1.8.0