From 3c300ea1e3e57f25d4b616c034bc5b5666b74e66 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Fri, 8 Aug 2025 11:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jcl/organization/service/OrganaztionService.java     | 2 ++
 .../organization/service/impl/OrganaztionSeviceImpl.java | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java
index 505e07a..3d13388 100644
--- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java
+++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/OrganaztionService.java
@@ -12,4 +12,6 @@ public interface OrganaztionService {
     void delOrganaztionDepartment(Department department, SimpleEmployee employee);
 
     void updateOrganaztionDepartment(Department department, SimpleEmployee employee);
+
+    void mergeOrganaztionDepartment(Department department, SimpleEmployee employee);
 }
diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java
index 99a5902..e77da26 100644
--- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java
+++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/OrganaztionSeviceImpl.java
@@ -69,4 +69,13 @@ public class OrganaztionSeviceImpl implements OrganaztionService {
                 CommonUtils.null2String(dataList.get(0).get("sjzzmc")),CommonUtils.null2String(dataList.get(0).get("sjzz")),CommonUtils.null2String(dataList.get(0).get("sjzzbh")),department.getBh()));
 
     }
+
+    @Override
+    public void mergeOrganaztionDepartment(Department department, SimpleEmployee employee) {
+        String bhbbmid = department.getBhbbmid();
+        String sql = "update uf_organization_bghzzsj set delete_type='1' where bh in (?)";
+        databaseUtils.execute(sql,CommonUtils.getParamList(bhbbmid));
+        addOrganaztionDepartment( department, employee);
+
+    }
 }