修改打卡获取信息接口下班打卡时判断

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wspunch/service/WsPunchClockService.java

@@ -163,16 +163,18 @@ public class WsPunchClockService extends CrudService<WsPunchClockMapper, WsPunch
 							clockType=2;
 						}
 						//判断距离在不在围栏内(没打下班卡)（获取上班打卡的围栏）
+						Boolean distanceTrue=false;  //默认定义不存在围栏范围内
 						List<WsCompanyFence> wsCompanyFenceList=wsCompanyFenceService.getByCompany(wsPunchClock.getCompanyId());
 						for (int i = 0; i <wsCompanyFenceList.size() ; i++) {
 							WsCompanyFence wsCompanyFence=wsCompanyFenceList.get(i);
 							Long distance=getDistance(longitude+","+latitude,wsCompanyFence.getLongitude()+","+wsCompanyFence.getLatitude(),Global.getGdWebKey());
 							if(distance<=wsCompanyFence.getFenceArea()){
+								distanceTrue=true;
 								break;
 							}
-							if(i==wsCompanyFenceList.size()-1){
-								clockType=3;
-							}
+						}
+						if(!distanceTrue){
+							clockType=3;
 						}
 						returnMap.put("endPunch", "未完成");
 					}