From 985128668f4d78222ce308f8cfce4d95d7019383 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 11 Oct 2021 18:00:35 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=20?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=92=8C=E8=8E=B7=E5=8F=96=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/controller/PayMeetingSituationController.java  | 2 +-
 .../service/impl/PayMeetingSituationServiceImpl.java       | 7 +++----
 .../src/main/java/com/jero/meeting/vo/SignInVO.java        | 3 ---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index e9e4495a..2ca129cd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -326,7 +326,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
      */
     @ApiOperation(value = "获得签到页面")
     @GetMapping(value = "/getSignInPage")
-    public Result<?> getSignInPage(@RequestBody SignInVO signInVO) {
+    public Result<?> getSignInPage(SignInVO signInVO) {
         ValidUtil.validate(signInVO);
         SignInPageVO signInPageVO = payMeetingSituationService.signIn(signInVO);
         return Result.OK(signInPageVO);
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 a10e6658..01c32f4b 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
@@ -555,13 +555,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (!belongCalendar(new Date(), payMeeting.getStartSignInTime(), payMeeting.getEndSignInTime())) {
             throw new JeroBootException("不在会议可签到时间内,无法签到");
         }
-        String companyContactId = signInVO.getCompanyContactId();
-        PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
-        if (contactsManagement == null) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (loginUser == null) {
             throw new JeroBootException("参会人不存在");
-
         }
 
+        String companyContactId = loginUser.getId();
         LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
         wrapper.eq(PayMeetingSituation::getCompanyContactId, companyContactId);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInVO.java
index f1503b6a..0249795f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/SignInVO.java
@@ -14,9 +14,6 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 public class SignInVO {
-    @NotBlank(message = "参会人id不能为空")
-    @ApiModelProperty(value = "参会人id")
-    private String companyContactId;
     @ApiModelProperty(value = "会议id")
     @NotBlank(message = "会议id不能为空")
     private String meetingId;