日志

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) {