From c08a660fa0fbdbd0d24fb02bfd220e1a59c0029f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 20 Sep 2022 19:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryArchiveItemServiceImpl.java    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
index 70a9c320f..31906e437 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
@@ -123,6 +123,10 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
 
         // 薪资档案
         SalaryArchivePO salaryArchive = salaryArchiveMapper.getById(salaryArchiveId);
+        if (salaryArchive == null) {
+            throw new SalaryRunTimeException("薪资档案不存在！");
+        }
+
         // 获取当前已生效数据
         List<SalaryArchiveItemPO> effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveId, salaryItemIds);
 
@@ -305,13 +309,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
     public String deleteSalaryItem(Long salaryArchiveItemId) {
         SalaryArchiveItemPO salaryArchiveItem = salaryArchiveItemMapper.getById(salaryArchiveItemId);
         if (salaryArchiveItem == null) {
-           throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除"));
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除"));
         }
         if (salaryArchiveItem.getEffectiveTime().after(new Date())) {
             salaryArchiveItem.setDeleteType(1);
             // 删除未生效数据
             salaryArchiveItemMapper.updateById(salaryArchiveItem);
-        }else{
+        } else {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "该薪资项目已生效不可删除"));
         }
         return StringUtils.EMPTY;
@@ -345,17 +349,17 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
         // 获取所有可被引用的薪资项目
         List<SalaryItemPO> salaryItems = salaryItemMapper.getCanAdjustSalaryItems();
         String[] header = {
-                SalaryI18nUtil.getI18nLabel( 85429, "姓名"),
-                SalaryI18nUtil.getI18nLabel( 86187, "员工状态"),
-                SalaryI18nUtil.getI18nLabel( 86185, "部门"),
-                SalaryI18nUtil.getI18nLabel( 84960, "薪资项目"),
-                SalaryI18nUtil.getI18nLabel( 85433, "调整前"),
-                SalaryI18nUtil.getI18nLabel( 85434, "调整后"),
-                SalaryI18nUtil.getI18nLabel( 85431, "调整原因"),
-                SalaryI18nUtil.getI18nLabel( 85904, "生效日期"),
-                SalaryI18nUtil.getI18nLabel( 85435, "操作人"),
-                SalaryI18nUtil.getI18nLabel( 85436, "操作时间"),
-                SalaryI18nUtil.getI18nLabel( 84961, "备注")
+                SalaryI18nUtil.getI18nLabel(85429, "姓名"),
+                SalaryI18nUtil.getI18nLabel(86187, "员工状态"),
+                SalaryI18nUtil.getI18nLabel(86185, "部门"),
+                SalaryI18nUtil.getI18nLabel(84960, "薪资项目"),
+                SalaryI18nUtil.getI18nLabel(85433, "调整前"),
+                SalaryI18nUtil.getI18nLabel(85434, "调整后"),
+                SalaryI18nUtil.getI18nLabel(85431, "调整原因"),
+                SalaryI18nUtil.getI18nLabel(85904, "生效日期"),
+                SalaryI18nUtil.getI18nLabel(85435, "操作人"),
+                SalaryI18nUtil.getI18nLabel(85436, "操作时间"),
+                SalaryI18nUtil.getI18nLabel(84961, "备注")
         };
         // 2.表头
         List<Object> headerList = new ArrayList<>(Arrays.asList(header));