From 65dd37fa28891be5aeb60535e3f09639abbaea79 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 15 三月 2021 12:17:18 +0800
Subject: [PATCH] fix(bug修复): 员工附属信息级联删除
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
index 35e6b3f..508fc40 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionLogServiceImpl.java
@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.entity.EmpDimissionLog;
@@ -58,12 +60,16 @@
if (StringUtils.isNotBlank(empDimissionlog.getDimissionType())) {
queryWrapper.eq("a.dimissionType", empDimissionlog.getDimissionType());
}
+ if (empDimissionlog.getEmpId()!=null) {
+ queryWrapper.eq("a.empId", empDimissionlog.getEmpId());
+ }
if (StringUtils.isNotBlank(empDimissionlog.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empDimissionlog.getEmpStatus().split(","));
} else {
queryWrapper.in("b.EmpStatus", 0);
}
Page<Map<String, Object>> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
return this.baseMapper.selectPageVo(page,queryWrapper);
}
--
Gitblit v1.8.0