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 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 outSalaryBill(String salaryInfoCode) { - salaryInfoCode = AESEncryptUtil.decrypt4SalaryBill(salaryInfoCode); + salaryInfoCode = AESEncryptUtil.decrypt4SalaryBill2(salaryInfoCode); long salaryInfoId = Long.parseLong(salaryInfoCode); SalarySendInfoPO salarySendInfo = getSalarySendInfoMapper().getById(salaryInfoId); if (salarySendInfo == null) {