From e1440e9203a7aee05b39c6593e1eb958a72d5cd9 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Fri, 10 Jun 2022 11:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=BD=92=E6=A1=A3=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java                    | 2 +-
 .../salary/mapper/siaccount/InsuranceAccountBatchMapper.java   | 2 +-
 .../salary/mapper/siaccount/InsuranceAccountBatchMapper.xml    | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index c29c2c39c..98d9107c8 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -1310,7 +1310,7 @@ public class SIAccountBiz extends Service {
 
 //        SalaryAssert.isEmpty(insuranceAccountInspectPOS, SalaryI18nUtil.getI18nLabel( 100500, "当前核算月存在核算异常数据"));
         //开始归档数据
-        InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillStatus(billMonth, BillStatusEnum.NOT_ARCHIVED.getValue());
+        InsuranceAccountBatchPO insuranceAccountBatchPO = MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).getByBillStatus(billMonth, BillStatusEnum.NOT_ARCHIVED.getValue(), paymentOrganization);
 
         SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(100503, "月份账单不存在"));
         SalaryAssert.isFalse(insuranceAccountBatchPO.getBillStatus() == BillStatusEnum.ARCHIVED.getValue(), SalaryI18nUtil.getI18nLabel(100504, "月份账单已归档"));
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
index d4c1ea3ee..5a33d0c95 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
@@ -55,7 +55,7 @@ public interface InsuranceAccountBatchMapper {
      * @param billStatus
      * @return
      */
-    InsuranceAccountBatchPO getByBillStatus(@Param("billMonth") String billMonth,@Param("billStatus")Integer billStatus);
+    InsuranceAccountBatchPO getByBillStatus(@Param("billMonth") String billMonth,@Param("billStatus")Integer billStatus, @Param("paymentOrganization") Long paymentOrganization);
 
 
     List<InsuranceAccountBatchPO> listByTimeRange(@Param("minDate") String minDate, @Param("maxDate") String maxDate);
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
index f14797538..c85470d7d 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
@@ -189,6 +189,9 @@
         WHERE t.delete_type = 0
         AND t.bill_month = #{billMonth}
         AND t.bill_status = #{billStatus}
+        <if test="paymentOrganization != null">
+            AND t.payment_organization = #{paymentOrganization}
+        </if>
     </select>