From 2de35eb94ae4e9dd80a8588687bacfec72b23faf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 29 Dec 2023 17:14:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9D=A5=E6=AC=BE=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=8C=E4=BC=9A=E5=91=98=E5=8D=95=E4=BD=8D=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E4=B8=8B=E8=BD=BD=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/controller/PayMeetingController.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 3700a76e..73911865 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -17,6 +17,10 @@ import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.*;
+import com.jero.company.common.PayContactsManagementCommon;
+import com.jero.company.entity.PayCompanyManagement;
+import com.jero.company.entity.PayContactsManagement;
+import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.data.entity.PayCaseCommittee;
 import com.jero.data.entity.PayCaseCommitteeSubitem;
@@ -84,6 +88,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
     @Resource
     private IPayContactsManagementService payContactsManagementService;
     @Resource
+    private IPayCompanyManagementService payCompanyManagementService;
+    @Resource
     private IPayMeetingSituationService payMeetingSituationService;
     @Resource
     private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@@ -513,6 +519,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         }
         Integer meetingType = payMeeting.getMeetingType();
         //如果是分标委会议或理事会会议，判断是否为成员
+        //如果是标协会议，判断公司是否是会员单位
         boolean isSubItem = false;
         if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)) {
             LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
@@ -531,7 +538,16 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             if (count > 0) {
                 isSubItem = true;
             }
+        } else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
+            PayContactsManagement contactsManagement = payContactsManagementService.getById(sysUserId);
+            String companyId = contactsManagement.getCompanyId();
+            PayCompanyManagement companyManagement = payCompanyManagementService.getById(companyId);
+            String memberId = companyManagement.getMemberId();
+            if (StringUtils.isNotBlank(memberId)) {
+                isSubItem = true;
+            }
         }
+
         String meetingMinute = payMeeting.getMeetingMinute();
         String meetingData = payMeeting.getMeetingData();
         List<String> fileList = new ArrayList<>();