From 5673b449296362f78beede7cde7e1d1aba095089 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 29 May 2024 16:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=88=E5=B9=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=B0=E5=BD=95=20=E4=BA=BA=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=8E=86=E5=8F=B2=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/wrapper/DepartmentWrapper.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/wrapper/DepartmentWrapper.java b/src/com/engine/organization/wrapper/DepartmentWrapper.java
index 061e9cca..e822102b 100644
--- a/src/com/engine/organization/wrapper/DepartmentWrapper.java
+++ b/src/com/engine/organization/wrapper/DepartmentWrapper.java
@@ -1,5 +1,6 @@
 package com.engine.organization.wrapper;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.api.browser.bean.SearchConditionGroup;
 import com.engine.common.util.ServiceUtil;
@@ -9,21 +10,23 @@ import com.engine.organization.entity.company.po.CompPO;
 import com.engine.organization.entity.department.param.*;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.department.vo.SingleDeptTreeVO;
+import com.engine.organization.entity.hrmresource.po.ResourceChartPO;
 import com.engine.organization.entity.job.vo.SingleJobTreeVO;
 import com.engine.organization.entity.searchtree.SearchTreeParams;
 import com.engine.organization.enums.LogModuleNameEnum;
 import com.engine.organization.enums.OperateTypeEnum;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
+import com.engine.organization.mapper.resource.HrmResourceMapper;
 import com.engine.organization.service.DepartmentService;
 import com.engine.organization.service.impl.DepartmentServiceImpl;
+import com.engine.organization.util.HrmStatusHistoryUtil;
 import com.engine.organization.util.MenuBtn;
 import com.engine.organization.util.OrganizationWrapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.page.PageInfo;
 import com.engine.organization.util.response.ReturnResult;
 import org.apache.commons.lang.StringUtils;
-import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.util.Collection;
@@ -46,6 +49,10 @@ public class DepartmentWrapper extends OrganizationWrapper {
     private DepartmentMapper getDepartmentMapper() {
         return MapperProxyFactory.getProxy(DepartmentMapper.class);
     }
+    private HrmResourceMapper getHrmResourceMapper() {
+        return MapperProxyFactory.getProxy(HrmResourceMapper.class);
+    }
+
     private CompMapper getCompMapper() {
         return MapperProxyFactory.getProxy(CompMapper.class);
     }
@@ -236,7 +243,12 @@ public class DepartmentWrapper extends OrganizationWrapper {
     @Log(operateType = OperateTypeEnum.MERGE, operateDesc = "合并部门", operateModule = LogModuleNameEnum.DEPARTMENT)
     public int mergeDepartment(DepartmentMergeParam mergeParam) {
         DepartmentPO departmentPO = getDepartmentMapper().getDeptById(mergeParam.getId());
+        //被合并的部门人员工作记录表记录调动
+        List<ResourceChartPO> resourceChartPOList = getHrmResourceMapper().selectByDepartmentId(mergeParam.getDepartment());
         int mergeDepartment = getDepartmentService(user).mergeDepartment(mergeParam);
+        if (CollectionUtil.isNotEmpty(resourceChartPOList)) {
+            HrmStatusHistoryUtil.personWorkRecord(resourceChartPOList,mergeParam.getId(),"合并部门");
+        }
         writeOperateLog(new Object() {
         }.getClass(), departmentPO.getDepartmentName(), JSON.toJSONString(mergeParam), departmentPO, getDepartmentMapper().getDeptById(departmentPO.getId()));
         return mergeDepartment;