From 4a385da2e63d5c030dab4490c526d2273031821b Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Fri, 24 May 2024 17:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E5=AE=A1=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/LineCalendarsEventMapper.xml  | 6 ++----
 .../main/java/com/cool/store/config/SignValidateFilter.java | 4 ++--
 .../java/com/cool/store/config/TokenValidateFilter.java     | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
index 89cdcc1b9..ead8b5c53 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineCalendarsEventMapper.xml
@@ -32,13 +32,11 @@
       xfsg_line_calendars_event
     where
       <![CDATA[((start_time > #{startTime} and start_time < #{endTime}) or (end_time > #{startTime} and end_time < #{endTime}))]]>
-    and
-      interview_type = #{interviewType}
     <if test="interviewType == 0">
-      and interviewer_user_id = #{interviewerUserId}
+      and interviewer_user_id = #{interviewerUserId} and interview_type in ('0')
     </if>
     <if test="interviewType == 1 or interviewType == 2">
-      and region_id = #{regionId}
+      and region_id = #{regionId} and interview_type in ('1', '2')
     </if>
     <if test="excludeInterviewId != null">
       and id != #{excludeInterviewId}
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
index 4b01baecb..d7702cb72 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
@@ -100,7 +100,7 @@ public class SignValidateFilter implements Filter {
         String method = request.getMethod();
         String userStr = "";
         boolean isInWhiteList = excludePath(uri);
-        log.info("url:{}", uri);
+        log.info("url:{}, method:{}", uri, method);
         if ( !isInWhiteList && !method.equals("OPTIONS")) {
             String params = "";
             if("GET".equalsIgnoreCase(method)){
@@ -136,7 +136,7 @@ public class SignValidateFilter implements Filter {
             PartnerUserInfoVO partnerUserInfoVO = wechatMiniAppService.getUserInfo(phone, plaintextOpenid);
             if(partnerUserInfoVO != null){
                 userStr = JSONObject.toJSONString(partnerUserInfoVO);
-                log.info("url:{}, userStr:{}", uri, userStr);
+                log.info("userStr:{}", userStr);
             }
         }
         try {
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
index a5728ccdc..beaac2820 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/config/TokenValidateFilter.java
@@ -100,7 +100,7 @@ public class TokenValidateFilter implements Filter {
                 currentUser = JSON.parseObject(userStr, LoginUserInfo.class);
             }
         }
-        log.info("url:{}", uri);
+        log.info("url:{}, method:{}", uri, method);
         if ( !isInWhiteList && !method.equals("OPTIONS")) {
             if (StringUtils.isEmpty(accessToken)) {
                 response.setStatus(HttpStatus.OK.value());
@@ -114,7 +114,7 @@ public class TokenValidateFilter implements Filter {
                         ResponseResult.fail(ErrorCodeEnum.ACCESS_TOKEN_INVALID)));
                 return;
             }
-            log.info("url:{}, access_token:{}, userId:{}, username:{}", uri, accessToken, currentUser.getUserId(), currentUser.getName());
+            log.info("access_token:{}, userId:{}, username:{}", accessToken, currentUser.getUserId(), currentUser.getName());
         }
         if(StringUtils.isBlank(userStr) && !isInWhiteList){
             response.setStatus(HttpStatus.OK.value());