From 0bcafd39344f889003338d37afb0fe4d9a2f9ef7 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 9 Apr 2025 17:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E7=A8=8E=E7=94=B3?=
 =?UTF-8?q?=E6=8A=A5=20=E4=B8=8D=E5=90=8C=E7=A8=8E=E6=AC=BE=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E6=9C=9F=E6=A0=A1=E9=AA=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml | 3 +++
 .../engine/salary/service/impl/TaxDeclarationServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
index 243855ec1..12d7e6c4a 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
@@ -143,6 +143,9 @@
         <if test="taxCycleDateRange != null and taxCycleDateRange.endDate != null">
             AND t.tax_cycle <![CDATA[ <= ]]> #{taxCycleDateRange.endDate}
         </if>
+        <if test="taxAgentId != null">
+            AND sob.tax_agent_id = #{taxAgentId}
+        </if>
         ORDER BY t.id DESC
     </select>
     <select id="listByCreateDate" resultType="com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO">
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index f9a355c90..62a3df5a8 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -205,7 +205,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
                         .replace("{1}", SalaryDateUtil.getFormatYearMonth(saveParam.getSalaryMonth())));
             }
             // 查询薪资所属月的薪资核算记录
-            salaryAcctRecordPOS = listBySalaryMonth(SalaryAcctRecordPO.builder().salaryMonths(salaryMonthDateRange).build());
+            salaryAcctRecordPOS = listBySalaryMonth(SalaryAcctRecordPO.builder().salaryMonths(salaryMonthDateRange).taxAgentId(taxAgentId).build());
 
             // 无薪资核算记录，不允许生成个税申报表
             if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) {