diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AttendanceJgwTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AttendanceJgwTask.java
index 427fe0ce..e82427e5 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AttendanceJgwTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AttendanceJgwTask.java
@@ -1095,7 +1095,6 @@ public class AttendanceJgwTask {
         String dtEnd=DateUtil.format(DateTime.now(),"yyyy-MM-dd");
         String dtStart=DateUtil.format(DateUtil.offsetDay(DateTime.now(),-30),"yyyy-MM-dd");
         syncAttendanceData(dtStart,dtEnd);
-        syncAttendanceData(dtStart,dtEnd);
     }
 
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index dfdab787..9f1d3f9d 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="serverid != null "> and serverid = #{serverid}</if>
             <if test="workerId != null "> and workerId = #{workerId}</if>
             <if test="attendanceOutTime!=null and  attendanceOutTime!=''">
-              and  date(attendance_out_time) &lt;=date(#{attendanceOutTime})
+              and  (date(attendance_out_time) &lt;=date(#{attendanceOutTime}) or date(attendance_time) &lt;=date(#{attendanceOutTime}))
             </if>
 
             <if test="teamId != null "> and teamId = #{teamId}</if>
@@ -175,7 +175,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanPhoto != null  and scanPhoto != ''"> and scanPhoto like concat('%', #{scanPhoto}, '%')</if>
             <if test="workerName != null  and workerName != ''"> and workerName like concat('%', #{workerName}, '%')</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
-            <if test="attendanceTime != null  and attendanceTime != ''"> and date(attendance_time) &gt;= date(#{attendanceTime})</if>
+            <if test="attendanceTime != null  and attendanceTime != ''"> and
+                (date(attendance_time) &gt;= date(#{attendanceTime}) or date(attendance_out_time) &gt;= date(#{attendanceTime}) )</if>
             <if test="identification != null  and identification != ''"> and identification = #{identification}</if>
         </where>
         order by id desc