From 967c2274737d3f37ca1b35b7d1e497d7ac274002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 9 Dec 2025 14:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A8=E9=80=9A=EF=BC=8C=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/encrypt/AESEncryptUtil.java | 20 +++++++++++++++++++
 .../entity/salaryBill/bo/SalaryBillBO.java    |  2 +-
 .../salary/wrapper/SalarySendWrapper.java     |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/encrypt/AESEncryptUtil.java b/src/com/engine/salary/encrypt/AESEncryptUtil.java
index 99d68d106..a6f62e268 100644
--- a/src/com/engine/salary/encrypt/AESEncryptUtil.java
+++ b/src/com/engine/salary/encrypt/AESEncryptUtil.java
@@ -61,6 +61,26 @@ public class AESEncryptUtil {
         return encryptStr;
     }
 
+    /**
+     * 工资单推送-员工id加密
+     * @param source
+     * @return
+     */
+    public static String encrypt4SalaryBill2(String source) {
+        //防止初始化老数据时二次加密
+        if (StringUtils.isNotBlank(source)) {
+            return AES.encrypt(source, aes4SalaryBillEncryptScrect);
+        }
+        return source;
+    }
+
+    public static String decrypt4SalaryBill2(String encryptStr) {
+        if (StringUtils.isNotBlank(encryptStr)) {
+            AES.decrypt(encryptStr, aes4SalaryBillEncryptScrect);
+        }
+        return encryptStr;
+    }
+
 
     /**
      * AES解密
diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
index 3c27d20d8..2fbeffaad 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
@@ -373,7 +373,7 @@ public class SalaryBillBO {
                 }
             }
         }
-        String salaryInfoCode = AESEncryptUtil.encrypt4SalaryBill(Util.null2String(e.get("id")));
+        String salaryInfoCode = AESEncryptUtil.encrypt4SalaryBill2(Util.null2String(e.get("id")));
         String link_param = content.replace("%salaryInfoCode%", salaryInfoCode);
 
         Map<String,Object> map = new HashMap<>();
diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java
index 112217745..6b9553655 100644
--- a/src/com/engine/salary/wrapper/SalarySendWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java
@@ -680,7 +680,7 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy
     }
 
     public Map<String, Object> outSalaryBill(String salaryInfoCode) {
-        salaryInfoCode = AESEncryptUtil.decrypt4SalaryBill(salaryInfoCode);
+        salaryInfoCode = AESEncryptUtil.decrypt4SalaryBill2(salaryInfoCode);
         long salaryInfoId = Long.parseLong(salaryInfoCode);
         SalarySendInfoPO salarySendInfo = getSalarySendInfoMapper().getById(salaryInfoId);
         if (salarySendInfo == null) {