From aa8ecde02d63168e11cdd693c84cd4de5fe2e04e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 May 2021 20:26:25 +0800
Subject: [PATCH] 1.考勤打卡接口修改,根据坐标判断是否在多边形区域内 2.考勤打卡接口修改,根据打卡时间判断打卡的状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
index d85c502..eda5310 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/healthcode/mapper/healthcodeMapper.xml
@@ -237,10 +237,10 @@
     <!--导出健康码数据表格-->
     <select id="exportHealthcode" resultType="org.springblade.common.entity.HealthcodeExcel">
         SELECT * FROM healthcode
+        where 1=1
         <if test="healthcodeVO.type!=null and healthcodeVO.type!='undefined' ">
             and type=#{healthcodeVO.type}
         </if>
-        where 1=1
             <include refid="detailCondition"></include>
         ORDER BY dtime desc
     </select>

--
Gitblit v1.9.3