From 10bb8159aa0d0e7bf16494bcdb43241d64846e75 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 14 Nov 2022 19:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/mapper/extend/ExtDTMapper.java    | 2 +-
 src/com/engine/organization/mapper/extend/ExtDTMapper.xml     | 3 +++
 src/com/engine/organization/service/impl/CompServiceImpl.java | 2 +-
 .../organization/service/impl/DepartmentServiceImpl.java      | 4 ++--
 src/com/engine/organization/service/impl/ExtServiceImpl.java  | 4 ++--
 src/com/engine/organization/service/impl/JobServiceImpl.java  | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/organization/mapper/extend/ExtDTMapper.java b/src/com/engine/organization/mapper/extend/ExtDTMapper.java
index 47737dc8..d0b865ba 100644
--- a/src/com/engine/organization/mapper/extend/ExtDTMapper.java
+++ b/src/com/engine/organization/mapper/extend/ExtDTMapper.java
@@ -37,5 +37,5 @@ public interface ExtDTMapper {
      * @param mainId
      * @return
      */
-    int deleteByMainID(@Param("tableName") String tableName, @Param("mainId") long mainId);
+    int deleteByMainID(@Param("tableName") String tableName, @Param("mainId") long mainId, @Param("groupId") Long groupId);
 }
diff --git a/src/com/engine/organization/mapper/extend/ExtDTMapper.xml b/src/com/engine/organization/mapper/extend/ExtDTMapper.xml
index d9ef99a7..422e31ba 100644
--- a/src/com/engine/organization/mapper/extend/ExtDTMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtDTMapper.xml
@@ -19,6 +19,9 @@
         delete
         from ${tableName}
         where mainid = #{mainId}
+        <if test=" null!=groupId ">
+            and group_id = #{groupId}
+        </if>
     </delete>
 
     <select id="listCompExtDT" resultType="map">
diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java
index a00b4bf7..e9ca8e6b 100644
--- a/src/com/engine/organization/service/impl/CompServiceImpl.java
+++ b/src/com/engine/organization/service/impl/CompServiceImpl.java
@@ -237,7 +237,7 @@ public class CompServiceImpl extends Service implements CompService {
             new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.CANCELED, map).sync();
             // 删除拓展表、明细表
             MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_compext", id);
-            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_compext_dt1", id);
+            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_compext_dt1", id,null);
         }
         return getCompMapper().deleteByIds(ids);
     }
diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
index 19b72323..36fa853b 100644
--- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
@@ -347,7 +347,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.CANCELED, map).sync();
             // 删除拓展表、明细表
             MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_deptext", id);
-            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_deptext_dt1", id);
+            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_deptext_dt1", id, null);
         }
 
         return getDepartmentMapper().deleteByIds(ids);
@@ -677,7 +677,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.CANCELED, map).sync();
         // 删除拓展表、明细表
         MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_deptext", mergeParam.getId());
-        MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_deptext_dt1", mergeParam.getId());
+        MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_deptext_dt1", mergeParam.getId(), null);
         getDepartmentMapper().deleteByIds(DeleteParam.builder().ids(mergeParam.getId().toString()).build().getIds());
         // 更新组织架构图
         new DepartmentTriggerRunnable(mergeDepartment).run();
diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java
index 7f372fac..467d5e28 100644
--- a/src/com/engine/organization/service/impl/ExtServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java
@@ -176,7 +176,6 @@ public class ExtServiceImpl extends Service implements ExtService {
             tableMap.put("hide", false);
             tableMap.put("tabname", getExtendGroupMapper().getGroupNameById(Util.null2String(entry.getKey())));
             Map<String, Object> tabinfoMap = new HashMap<>();
-            //TODO 需优化
             tabinfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, entry.getValue(), viewAttr, showLabel));
             tabinfoMap.put("rownum", "rownum" + entry.getKey());
 
@@ -301,7 +300,7 @@ public class ExtServiceImpl extends Service implements ExtService {
             int rowNum = Util.getIntValue((String) params.get("rownum" + groupId));
             if (deleteFlag && rowNum > 0) {
                 // 删除原有明细表数据
-                getExtDTMapper().deleteByMainID(tableName, id);
+                getExtDTMapper().deleteByMainID(tableName, id, groupId);
                 deleteFlag = false;
             }
             List<ExtendInfoPO> filterS = poMaps.get(groupId);
@@ -314,6 +313,7 @@ public class ExtServiceImpl extends Service implements ExtService {
                     map.put(extendInfoPO.getFieldName(), params.get(extendInfoPO.getFieldName() + "_" + i));
                 }
                 map.put("mainid", id);
+                map.put("group_id", groupId);
                 map.put("creator", user.getUID());
                 map.put("delete_type", 0);
                 map.put("create_time", new Date());
diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java
index 892763c4..2e9722fc 100644
--- a/src/com/engine/organization/service/impl/JobServiceImpl.java
+++ b/src/com/engine/organization/service/impl/JobServiceImpl.java
@@ -515,7 +515,7 @@ public class JobServiceImpl extends Service implements JobService {
             new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobsById).sync();
             // 删除拓展表、明细表
             MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_jobext", jobsById.getId());
-            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_jobext_dt1", jobsById.getId());
+            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_jobext_dt1", jobsById.getId(), null);
         }
         return getJobMapper().deleteByIds(ids);
     }