From 8442a5c85686ea761807b3c8ecdb2b70c8413afb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Sep 2021 15:41:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A0=E6=B3=95=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 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 a91676fc..0f30b2b8 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
@@ -263,29 +263,32 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         saveMeetingSituation(payMeetingSituation1);
         //处理打包
         handlePack(payMeetingSituation1);
-
-        if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
-            //工作组以公司为维度
-            LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId());
-            wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
-            boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0;
-            judgeSend(payMeeting, payMeetingSituation1, isSubItem);
+        Integer identity = payMeetingSituation1.getIdentity();
+        //如果是参会人判断是上传了缴费凭证
+        if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)){
+            if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
+                //工作组以公司为维度
+                LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId());
+                wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
+                boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0;
+                judgeSend(payMeeting, payMeetingSituation1, isSubItem);
 
 
-        } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
-            //分标委以人为维度
-            LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());
-            wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId());
+            } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
+                //分标委以人为维度
+                LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(PayCaseCommitteeSubitem::getCommitteeId, payMeeting.getCaseCommitteeId());
+                wrapper.eq(PayCaseCommitteeSubitem::getContactsId, payMeetingSituation1.getCompanyContactId());
 
-            int count = payCaseCommitteeSubitemService.count(wrapper);
-            if (count > 0) {
-                payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+                int count = payCaseCommitteeSubitemService.count(wrapper);
+                if (count > 0) {
+                    payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
+                }
             }
+            //上传付款凭证发送邮件提醒审批
+            SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
         }
-        //上传付款凭证发送邮件提醒审批
-        SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
     }
 
     /**