From 5b05d2eb4051d9ebd044a5036b3b7881231e176d Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 4 Sep 2025 21:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/domain/vo/reissuecard/BusReissueCardVo.java   | 5 +++++
 .../project/service/impl/BusAttendanceServiceImpl.java    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
index 6be87932..b2ad1356 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/reissuecard/BusReissueCardVo.java
@@ -156,4 +156,9 @@ public class BusReissueCardVo implements Serializable {
      * 头像
      */
     private String avatar;
+
+    /**
+     * 补卡类型（1上班 2下班）
+     */
+    private String reissueCardType;
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
index cfb0b23b..bc0996fd 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
@@ -595,8 +595,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
 
         LambdaQueryWrapper<SubConstructionUser> wrapper =  new LambdaQueryWrapper<>();
         wrapper.eq(SubConstructionUser::getProjectId, dto.getProjectId());
-        wrapper.in("1".equals(dto.getClockStatus()),SubConstructionUser::getId,attendanceUserIds);
-        wrapper.notIn("2".equals(dto.getClockStatus()),SubConstructionUser::getId,attendanceUserIds);
+        wrapper.in("1".equals(dto.getClockStatus()),SubConstructionUser::getSysUserId,attendanceUserIds);
+        wrapper.notIn("2".equals(dto.getClockStatus()),SubConstructionUser::getSysUserId,attendanceUserIds);
         wrapper.eq(StrUtil.isNotBlank(dto.getTypeOfWork()),SubConstructionUser::getTypeOfWork,dto.getTypeOfWork());
         wrapper.eq(dto.getTeamId()!=null,SubConstructionUser::getTeamId,dto.getTeamId());
         Page<SubConstructionUser> result = constructionUserService.page(pageQuery.build(), wrapper);
@@ -609,9 +609,9 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
             SysUserVo sysUserVo = userService.selectUserById(constructionUser.getSysUserId());
             attendanceUserVo.setUserId(sysUserVo.getUserId());
             attendanceUserVo.setNickName(sysUserVo.getNickName());
+            if (sysUserVo.getAvatar() != null) {
             SysOssVo byId = ossService.getById(sysUserVo.getAvatar());
-            if (byId != null) {
-                attendanceUserVo.setAvatar(byId.getUrl());
+            attendanceUserVo.setAvatar(byId==null?null:byId.getUrl());
             }
             attendanceUserVo.setTypeOfWork(attendanceUserVo.getTypeOfWork());
             attendanceUserVo.setTeamName(attendanceUserVo.getTeamName());