From cb111cf53dca827eb5ebc69682a4ceb48852f1d4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 29 Jul 2024 15:25:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087657=20=E6=99=AE=E9=80=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86-=E7=BC=96=E8=BE=91-=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E5=A1=AB=E5=85=A5=E9=94=81=E5=AE=9A=E4=B8=AD=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E5=B9=B4=E4=BB=BD=EF=BC=8C=E5=8D=B4=E6=B2=A1?=
 =?UTF-8?q?=E6=8A=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/PayCommonProjectServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index 309f63f7..7a277cc9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -188,7 +188,10 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
 
         String year = payCommonProjectOld.getYear();
         //判断用户是否能操作所选年份数据
-        AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
+        AnnualDataLocking annualDataLocking1 = annualDataLockingService.judgeUserYear(year);
+        String year1 = payCommonProject.getYear();
+        AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year1);
+
         // 项目为打包状态 || 到账！=0 || 开票！=0 || 邮寄！=0
         if(!Objects.equals(payCommonProject.getChargeCompanyId(),payCommonProjectOld.getChargeCompanyId())
                 && (Objects.equals(payCommonProject.getPack(),PayProjectCommon.PACKAGING1)