Merge branch 'release/2.11.1.2402.01' into release/个税版本

src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java

@@ -269,10 +269,6 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         // 校验
         validSaveParam(saveParam);
 
-
-        //清除原数据
-        cleanOldData(salarySobId);
-
         //保存
         saveSobItem(saveParam);
 
@@ -325,34 +321,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) {
@@ -664,6 +643,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
         // 保存薪资账套的薪资项目副本
         batchSave(salarySobItems);
 
+        // 删除原薪资项目是否显示
+        deleteItemShowBySalarySobIds(Collections.singleton(salarySobId));
         // 保存薪资账套的薪资项目隐藏信息
         batchSaveShow(needInsertItemShow);
     }