From 14c97d8df96238f1a03134408d78de6453d21cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 27 Dec 2023 14:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/wrapper/TaxDeclareRecordWrapper.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
index 17b58d8e1..0de9131ea 100644
--- a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
+++ b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java
@@ -36,7 +36,6 @@ import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.stereotype.Component;
 import weaver.general.Util;
 import weaver.hrm.User;
 
@@ -52,7 +51,6 @@ import java.util.stream.Collectors;
  * @version 1.0
  **/
 @Slf4j
-@Component
 public class TaxDeclareRecordWrapper extends Service {
 
 
@@ -674,6 +672,11 @@ public class TaxDeclareRecordWrapper extends Service {
 
     public TaxDeclareRecordDetailFormDTO getAddForm(TaxDeclareRecordDetailFormParam param) {
         TaxDeclarationPO taxDeclaration = getTaxDeclarationService(user).getById(param.getTaxDeclarationId());
+
+        if (taxDeclaration == null) {
+            throw new SalaryRunTimeException("申报表不存在!");
+        }
+
         // 查询个税申报表列
         List<TaxReportColumnPO> taxReportColumns = getTaxReportColumnService(user).listByIncomeCategory(IncomeCategoryEnum.parseByValue(taxDeclaration.getIncomeCategory()));
         //当前税款所属期报送成功且状态正常的人员
@@ -702,6 +705,7 @@ public class TaxDeclareRecordWrapper extends Service {
 
     /**
      * 新增
+     *
      * @param param
      */
     public void add(TaxDeclareRecordDetailSaveParam param) {
@@ -710,6 +714,7 @@ public class TaxDeclareRecordWrapper extends Service {
 
     /**
      * 编辑
+     *
      * @param param
      */
     public void edit(TaxDeclareRecordDetailSaveParam param) {