From 7078a34af3ca5262fbd030973312e8933e271eae Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Nov 2021 11:03:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E4=B9=8B=E5=90=8E=E9=9C=80=E8=A6=81=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=AE=A1=E6=A0=B8=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/config/shiro/ShiroConfig.java      | 1 +
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index 5a0e29b9..bcc90eaf 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -105,6 +105,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/company/changePasswordWithToken", "anon");//token修改密码
         filterChainDefinitionMap.put("/company/sendVerificationCode", "anon");//企业端发送验证码
         filterChainDefinitionMap.put("/company/WCLogin", "anon");//微信登录
+        filterChainDefinitionMap.put("/company/jscode2session", "anon");//微信登录凭证校验
 
         //和会员系统交互的接口
         filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议
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 4c83e515..9595522f 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
@@ -313,8 +313,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //上传付款凭证发送邮件提醒审批
         //SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
         //报名后返回是否不需要审核
-        return Objects.equals(payMeetingSituation.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)
-                && Objects.equals(payMeetingSituation.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
+        return Objects.equals(payMeetingSituation1.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)
+                && Objects.equals(payMeetingSituation1.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
     }
 
     /**