From b2ed99b4f9663c560cc012426ccc5fbad08c03b8 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Oct 2021 17:11:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=E9=99=A4=E4=BA=86=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=B9=8B=E5=A4=96=E7=9A=84?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B9=9F=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 44d3c806..87920ade 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -138,9 +138,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }
 
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!Objects.equals(payMeeting1.getDirectorId(),loginUser.getId())) {
-            throw new JeroBootException("只有会议负责人可以新增参会人");
+        if (!rolePermissionService.getRolePermission("committeeMeetingSituation:add")) {
+            if (!Objects.equals(payMeeting1.getDirectorId(),loginUser.getId())) {
+                throw new JeroBootException("只有会议负责人可以新增参会人");
+            }
         }
+
         payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
         //payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
         payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
@@ -252,7 +255,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
     private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
         payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
-        payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
         payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
 
         //到账
@@ -472,15 +474,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String sysUserId = sysUser.getId();
         String meetingType = payMeeting.getMeetingType().toString();
-        if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)) {
-            //只有会议负责人，对接人可以审批
-            if (!directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
-                throw new JeroBootException("只有会议负责人，对接人可以审批");
-            }
-        } else {
-            //只有会议负责人可以审批
-            if (!directorId.equals(sysUserId)) {
-                throw new JeroBootException("只有会议负责人可以审批");
+        if (!rolePermissionService.getRolePermission("committeeMeetingSituation:add")) {
+            if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)) {
+                //只有会议负责人，对接人可以审批
+                if (!directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
+                    throw new JeroBootException("只有会议负责人，对接人可以审批");
+                }
+            } else {
+                //只有会议负责人可以审批
+                if (!directorId.equals(sysUserId)) {
+                    throw new JeroBootException("只有会议负责人可以审批");
+                }
             }
         }
     }
@@ -843,6 +847,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //要保存的对象
         PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
         payMeetingSituation1.setAmountReceivable(new BigDecimal("0"));
+        payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
         //会议校验基础类
         MeetingEntity meetingEntity = new MeetingEntity();
         BeanUtils.copyProperties(payMeetingSituation, meetingEntity);