From 3ae98f5d00f2919647a18eaf380e992cdeef7983 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Jul 2024 14:28:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087786=20=E5=85=B6=E4=BB=96=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE-=E9=94=81=E5=AE=9A=E5=90=8E-=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD=E6=B2=A1=E6=9C=89=E6=8A=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingServiceImpl.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 349e13d7..eace24db 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -343,6 +343,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList);
         saveOrUpdate(payMeeting);
         String meetingId = payMeeting.getId();
+        //annualDataLockingService.judgeUserYear()
         // 同步预计到账日期
         LambdaUpdateWrapper<PayMeetingSituation> upPayMeetingSituation = new LambdaUpdateWrapper<>();
         upPayMeetingSituation.eq(PayMeetingSituation::getMeetingId, meetingId);
@@ -459,9 +460,15 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         if (id != null) {
             wrapper.ne(PayMeeting::getId, id);
             oldMeeting = getById(id);
+            String year = oldMeeting.getParticularYear();
+            //判断用户是否能操作所选年份数据
+            AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
         }else {
             payMeetingVO.setIsRelease(MeetingCommon.REMIND_0);
         }
+        String year = payMeetingVO.getParticularYear();
+        //判断用户是否能操作所选年份数据
+        AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
         if (count(wrapper) > 0) {
             throw new JeroBootException("会议名称不能重复");
         }
@@ -494,9 +501,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 throw new JeroBootException("会议费用为0时，不可上传收款二维码");
             }
         }
-        String year = payMeetingVO.getParticularYear();
-        //判断用户是否能操作所选年份数据
-        AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
+
         //根据会议类型进行校验
         switch (meetingType) {
             case MeetingCommon.WORKING_GROUP_MEETING: