优化

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)
 		);
 

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;