From 1703c96b6833244340dc10bf746d8c08a331008c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 三月 2021 11:22:18 +0800
Subject: [PATCH] fix(bug修复): 用户部门显示allDeptName
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index c45db03..7501963 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -79,6 +79,9 @@
private final IRemoteDicItemService remoteDicItemService;
private final EmpOccupationalMapper empOccupationalMapper;
private final IRemotePositionService remotePositionService;
+ private final EmpDimissionLogMapper empDimissionLogMapper;
+ private final EmpOpenArchivesMapper empOpenArchivesMapper;
+ private final EmpResignMapper empResignMapper;
@Override
public IPage<EmpBaseInfo> findEmpBaseInfos(QueryRequest request, EmpBaseInfo empBaseInfo) {
@@ -236,6 +239,25 @@
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
empBaseInfoMapper.logicDeleteByIds(list, operatorId);
+
+ //同步删除关联数据
+ //不良记录
+ empBadRecordMapper.logicDelByUserIds(list,operatorId);
+ empAccidentCasesMapper.logicDelByUserIds(list,operatorId);
+ empContractInfoMapper.logicDelByUserIds(list,operatorId);
+ empDimissionAttendMapper.logicDelByUserIds(list,operatorId);
+ empDimissionLogMapper.logicDelByUserIds(list,operatorId);
+ empInsuranceMapper.logicDelByUserIds(list,operatorId);
+ empJobChangeMapper.logicDelByUserIds(list,operatorId);
+ empLaborTroubleMapper.logicDelByUserIds(list,operatorId);
+ empLeaveInfoMapper.logicDelByUserIds(list,operatorId);
+ empOccupationalMapper.logicDelByUserIds(list,operatorId);
+ empOpenArchivesMapper.logicDelByUserIds(list,operatorId);
+ empPhysicalExamMapper.logicDelByUserIds(list,operatorId);
+ empRemarkInfoMapper.logicDelByUserIds(list,operatorId);
+ empResignMapper.logicDelByUserIds(list,operatorId);
+ empUnemploymentMapper.logicDelByUserIds(list,operatorId);
+ empWorkExperienceMapper.logicDelByUserIds(list,operatorId);
}
/**
@@ -378,6 +400,7 @@
saveChange.setOldDeptName(strDeptName[i]);
saveChange.setOldJobName(strJobName[i]);
saveChange.setNewDeptName(empJobChange.getNewDeptName());
+ saveChange.setAllDeptName(empJobChange.getAllDeptName());
saveChange.setNewJobName(empJobChange.getNewJobName());
saveChange.setChangeType(empJobChange.getChangeType());
saveChange.setChangeDate(empJobChange.getChangeDate());
@@ -392,6 +415,7 @@
Map<String, Object> mapParams = new HashMap<>();
mapParams.put("deptId", empJobChange.getDeptId());
mapParams.put("deptName", empJobChange.getNewDeptName());
+ mapParams.put("allDeptName", empJobChange.getAllDeptName());
mapParams.put("jobId", empJobChange.getJobId());
mapParams.put("jobName", empJobChange.getNewJobName());
mapParams.put("operatorId", operatorId);
--
Gitblit v1.8.0