From 09529fb4ba8fa5efac4ebde980a5a197d91180b5 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Mon, 6 May 2024 00:25:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml  | 1 +
 src/main/resources/application.properties                 | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml
index 91e31ea34..70914a2d6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzHikvisionSyncMapper.xml
@@ -16,6 +16,7 @@
         <if test="createDateBegin != null">
             and create_date >= #{createDateBegin}
         </if>
+        group by who_id
         ) t2 on
         t1.create_date=t2.create_date and t1.who_id=t2.who_id
         left join uface_dev ud on t1.device_sn = ud.dev_sn
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 92d68fc3b..3e8374564 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -103,10 +103,10 @@ swagger.enable=true
 #\u4E2A\u63A8\u914D\u7F6E
 getui.baseUrl=https://restapi.getui.com/v2/
 # 新配置
-getui.appId=Hl0bAepqhhAXcpcQqOuJ55
-getui.appKey=skHP0xOulH7OFQ0mFGP5k1
-getui.appSecret=vcF3ObJ8HD7rPKDe47QdG9
-getui.masterSecret=b5uvWer4j68IMzVj1eh9zA
+getui.appId=zP7A1fWyO98KaCHw8OunB9
+getui.appKey=hIeY0ufKl87kxVW3Tytch4
+getui.appSecret=A2QqlgTGQY9uOIMeBeaOe3
+getui.masterSecret=fnwjipGoAx8bXP2jPSHGc2
 #判断考勤回调是否需要图片,1是
 # 人员考勤图片类型 1：base64
 imageType=1