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 wrapper = new LambdaQueryWrapper<>(); @@ -531,7 +538,16 @@ public class PayMeetingController extends JeroController 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 fileList = new ArrayList<>();