From 81cbfd6cafe5e9593c61f4131ff882c092ab23f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com>
Date: Thu, 27 Mar 2025 10:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java | 2 +-
 .../java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
index c9e3f79..bf95823 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
@@ -670,7 +670,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 				.eq(WgzReissueacard::getUserId, wa.getUserId())
 				.eq(WgzReissueacard::getAttendanceId, wa.getId())
 				.eq(WgzReissueacard::getType, type)
-				.ne(WgzReissueacard::getAuditorOpinion, "3")
+				.ne(WgzReissueacard::getAuditorType, "3")
 				.orderByDesc(WgzReissueacard::getId)
 		);
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
index a19ed98..dc39d27 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java
@@ -242,6 +242,7 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
 		//获取请假详情
 		WgzLeave we = baseMapper.selectById(req.getId());
 		BgtProjectRecruitApply recruitApply = iBgtProjectRecruitApplyService.getById(we.getApplyKey());
+		BgtProjectRecruit recruit = iBgtProjectRecruitService.getById(recruitApply.getRecruitId());
 		//取消请假
 		WgzLeave wgzLeave = new WgzLeave().
 			setId(req.getId()).
@@ -252,10 +253,10 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
 			//状态取消成功需要把对应消息的状态变更为【不需要操作】
 			iBgtMessageService.operation(
 				USERTYPE_WGZ,
-				recruitApply.getUserId(),
+				recruit.getUserId(),
 				USERTYPE_BGT,
 				SecurityUtils.getAppUserId(),
-				recruitApply.getId(),
+				we.getId(),
 				SqlHelper.table(BgtProjectRecruitApply.class).getTableName()
 			);
 			return true;