Merge branch 'release/个税版本' into release/个税&业务线

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

@@ -496,6 +496,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
      */
     @Override
     public void checkBeforeSave(SalaryAcctRecordPO salaryAcctRecord, List<SalaryAcctTaxAgentPO> salaryAcctTaxAgents) {
+        //  如果个税申报功能是关闭的，则不需要检查
+        TaxDeclarationFunctionEnum taxDeclarationFunctionEnum = getSalarySysConfService(user).getTaxDeclaration();
+        if (taxDeclarationFunctionEnum == TaxDeclarationFunctionEnum.CLOSURE) {
+            return;
+        }
+
         // 查询薪资账套
         SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecord.getSalarySobId());
         IncomeCategoryEnum incomeCategoryEnums = IncomeCategoryEnum.parseByValue(salarySobPO.getIncomeCategory());