From 555a7b10c5e4cfd0c58871706dffac4b25d6b794 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 5 Jan 2022 17:25:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E5=91=98=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/service/impl/PayMeetingServiceImpl.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 b0ff8981..fb231a20 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
@@ -318,8 +318,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         LambdaQueryWrapper<PayMeeting> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayMeeting::getMeetingName, meetingName);
         String id = payMeetingVO.getId();
+        PayMeeting oldMeeting = null;
         if (id != null) {
             wrapper.ne(PayMeeting::getId, id);
+            oldMeeting = getById(id);
         }else {
             payMeetingVO.setIsRelease(MeetingCommon.REMIND_0);
         }
@@ -370,10 +372,10 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                     throw new JeroBootException("标协会议类型不存在");
                 }
                 payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType));
-
-                TbMemberProject memberProject = getTbMemberProject();
-                payMeeting.setStandardsId(memberProject.getId());
-
+                if (oldMeeting == null){
+                    TbMemberProject memberProject = getTbMemberProject();
+                    payMeeting.setStandardsId(memberProject.getId());
+                }
                 break;
             case MeetingCommon.INTERNATIONAL_MEETING:
                 ValidUtil.validate(payMeetingVO, InternationalMeeting.class);
@@ -782,6 +784,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 permission = "otherMeeting:search";
             }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){
                 permission = "committeeMeeting:search";
+            }else if (meetingType.equals(MeetingCommon.COUNCIL_MEETING_INT)){
+                permission = "committeeMeeting:search";
             }
         }
         if (StringUtils.isNotBlank(permission)) {