ysh 3 years ago
parent
commit
5b223dd04d

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/viewClockIn/mapper/xml/viewClockInMapper.xml

@@ -48,7 +48,7 @@
         and (
                 b.lateTime_s < 0 or b.lateTime_x > 0
                 || (b.ifwork !=0 and attendance_Count < 2 and b.name is not null)
-                || (b.name is not null and b.name != '' and (b.goto_time is null || b.goto_time = '' ||  b.goto_time = null))
+                || (b.ifwork !=0 and b.name is not null and b.name != '' and (b.goto_time is null || b.goto_time = '' ||  b.goto_time = null))
                 || b.duration is not null
             )
 
@@ -71,7 +71,7 @@
         and (
             b.lateTime_s < 0 or b.lateTime_x > 0
             || (b.ifwork !=0 and attendance_Count < 2 and b.name is not null)
-            || (b.name is not null and b.name != '' and (b.goto_time is null || b.goto_time = '' ||  b.goto_time = null))
+            || (b.ifwork !=0 and b.name is not null and b.name != '' and (b.goto_time is null || b.goto_time = '' ||  b.goto_time = null))
             || b.duration is not null
 
             )