From 86951d43b4689d9f24d034af7afc3fe4ef82d158 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Wed, 17 Dec 2025 14:57:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/vo/projectteammember/BusProjectTeamMemberVo.java   | 1 +
 .../project/service/impl/BusAttendanceServiceImpl.java        | 4 ++--
 .../project/service/impl/BusProjectTeamMemberServiceImpl.java | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
index 98fd137a..576ba926 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/projectteammember/BusProjectTeamMemberVo.java
@@ -81,6 +81,7 @@ public class BusProjectTeamMemberVo implements Serializable {
     /**
      * 头像
      */
+    @Translation(type = TransConstant.OSS_ID_TO_URL)
     private String avatar;
 
     /**
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 d4709dec..dd650bbd 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
@@ -596,8 +596,8 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     return this.save(attendance);
                 }
                 //考勤机打卡会有历史记录，需要更新状态
-                if (CollectionUtil.isNotEmpty(outAttendances) && "1".equals(req.getSource())) {
-                    BusAttendance busAttendance = outAttendances.getFirst();
+                if (CollectionUtil.isNotEmpty(inAttendances) && "1".equals(req.getSource())) {
+                    BusAttendance busAttendance = inAttendances.getFirst();
                     String oldStatus = busAttendance.getClockStatus();
                     //更新打卡时间
                     busAttendance.setClockTime(now);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
index e7bb52cc..4021ed71 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
@@ -513,6 +513,7 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
                 projectTeamMemberVo.setTypeOfWork(constructionUser.getTypeOfWork());
                 projectTeamMemberVo.setPhone(constructionUser.getPhone());
                 projectTeamMemberVo.setEntryDate(constructionUser.getEntryDate());
+                projectTeamMemberVo.setAvatar(constructionUser.getFacePic());
             }
             projectTeamMemberVo.setMemberName(memberName);
             return projectTeamMemberVo;