|
@@ -180,7 +180,7 @@ public class WsPunchClockService extends CrudService<WsPunchClockMapper, WsPunch
|
|
|
}
|
|
}
|
|
|
}else{
|
|
}else{
|
|
|
//判断距离在不在围栏内(没打上班卡)
|
|
//判断距离在不在围栏内(没打上班卡)
|
|
|
- List<WsCompanyFence> wsCompanyFenceList=wsCompanyFenceService.findList(new WsCompanyFence());
|
|
|
|
|
|
|
+ List<WsCompanyFence> wsCompanyFenceList=wsCompanyFenceService.findListIsOn(new WsCompanyFence());
|
|
|
Boolean distanceTrue=false; //默认定义不存在围栏范围内
|
|
Boolean distanceTrue=false; //默认定义不存在围栏范围内
|
|
|
if(wsCompanyFenceList.size()>0){
|
|
if(wsCompanyFenceList.size()>0){
|
|
|
//遍历比较是否存在围栏内
|
|
//遍历比较是否存在围栏内
|