From 3b1edddf00b40802c746e480d08c3e285e934758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 7 Mar 2024 10:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=96=AA=E8=B5=84=E8=B4=A6?=
 =?UTF-8?q?=E5=A5=97=E9=A1=B9=E7=9B=AE=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalarySobItemServiceImpl.java        | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
index 93de141bc..2729bf81f 100644
--- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
@@ -255,10 +255,6 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         // 校验
         validSaveParam(saveParam);
 
-
-        //清除原数据
-        cleanOldData(salarySobId);
-
         //保存
         saveSobItem(saveParam);
 
@@ -311,34 +307,17 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
     }
 
 
-    /**
-     * 清楚原相关数据
-     *
-     * @param salarySobId
-     */
-    private void cleanOldData(Long salarySobId) {
-        // 删除薪资账套的员工信息字段
-//        getSalarySobEmpFieldService(user).deleteBySalarySobIds(Collections.singleton(salarySobId));
-        // 删除薪资账套的薪资项目副本
-//        deleteBySalarySobIds(Collections.singleton(salarySobId));
-        // 删除薪资账套的薪资项目分类
-//        getSalarySobItemGroupService(user).deleteBySalarySobIds(Collections.singleton(salarySobId));
-        // 删除薪资项目是否显示
-        deleteItemShowBySalarySobIds(Collections.singleton(salarySobId));
-
-    }
-
     /**
      * 保存项目信息
      *
      * @param saveParam
      */
     private void saveSobItem(SalarySobItemSaveParam saveParam) {
-        //处理人员信息字段
-        handleEmpField(saveParam);
-
         //分组和薪资项
         handleGroupAndItem(saveParam);
+
+        //处理人员信息字段
+        handleEmpField(saveParam);
     }
 
     private void handleGroupAndItem(SalarySobItemSaveParam saveParam) {
@@ -646,6 +625,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         // 保存薪资账套的薪资项目副本
         batchSave(salarySobItems);
 
+        // 删除原薪资项目是否显示
+        deleteItemShowBySalarySobIds(Collections.singleton(salarySobId));
         // 保存薪资账套的薪资项目隐藏信息
         batchSaveShow(needInsertItemShow);
     }