From 902a63dcf2f44b141bdbae24ddeb8f71811af951 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Fri, 21 Feb 2025 16:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=9A=84=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/common/core/utils/encryption/AESCBCUtil.java |  4 ++--
 .../system/att/controller/AttHisPullController.java    |  1 -
 .../main/resources/mapper/att/AttSourceDataMapper.xml  | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java
index d698094..c0474ba 100644
--- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java
+++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java
@@ -41,8 +41,8 @@ public class AESCBCUtil {
 		/**
 		 * AES要求密钥长度为128位或192位或256位，java默认限制AES密钥长度最多128位
 		 */
-//		public static String sKey = "zhst@bonus@zhst@bonus@1234567890";
-		public static String sKey = "zhst@bonus@zhst@";
+		public static String sKey = "zhst@bonus@zhst@bonus@1234567890";
+//		public static String sKey = "zhst@bonus@zhst@";
 
 		/**
 		 * 编码格式
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttHisPullController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttHisPullController.java
index b12ebc1..b123a5d 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttHisPullController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttHisPullController.java
@@ -11,7 +11,6 @@ import com.bonus.system.att.entity.AttDataDetailsBean;
 import com.bonus.system.att.entity.OrgChangeBean;
 import com.bonus.system.att.service.AttCalService;
 import com.bonus.system.att.service.OrgChangeService;
-import com.bonus.system.att.tasks.AttTasks;
 import com.bonus.system.att.tasks.NewAttTask;
 import com.bonus.system.att.utils.AttTimeUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
index bf16203..5520029 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
@@ -262,7 +262,7 @@
                lat                                                as attLat,
                IF(attendance_external = '外勤打卡',1,2)            as isOutsideAtt,
                '1'                                                as dataSource
-        from gz_cloud.fc_sup_attendance sup
+        from gz_cloud_test.fc_sup_attendance sup
         where sup.attendance_date = #{pushDate}
           and is_wechat != 1
     </select>
@@ -477,7 +477,7 @@
         GROUP BY user_id
     </select>
     <select id="getAttPerson" resultType="com.bonus.system.att.entity.AttDataBean">
-        SELECT su.user_id,
+        SELECT ash.user_id,
                ash.group_id,
                suo.org_id,
                '1' AS attType,
@@ -486,9 +486,9 @@
         FROM att_setting_history ash
                  LEFT JOIN sys_user su ON ash.user_id = su.user_id
                  left join sys_user_org suo ON su.user_id = suo.user_id
-        WHERE ash.current_day = #{pushDate}
+        WHERE ash.current_day = #{pushDate} and suo.org_id is not null
         UNION
-        SELECT su.user_id,
+        SELECT ash.user_id,
                ash.group_id,
                suo.org_id,
                '2' AS attType,
@@ -497,7 +497,7 @@
         FROM att_setting_history ash
                  LEFT JOIN sys_user su ON ash.user_id = su.user_id
                  left join sys_user_org suo ON su.user_id = suo.user_id
-        WHERE ash.current_day = #{pushDate}
+        WHERE ash.current_day = #{pushDate} and suo.org_id is not null
     </select>
     <select id="getAttDataPerson" resultType="java.lang.Long">
         SELECT distinct user_id