diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml index 99b1408ac..9d54a0004 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctResultMapper.xml @@ -555,6 +555,15 @@ + + + + + when id=#{item.id} then #{item.originResultValue} + + + + diff --git a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java index e86a03f86..63483b0e1 100644 --- a/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java +++ b/src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java @@ -495,8 +495,10 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe salaryAcctResultPos.forEach(po -> { if (OpenEnum.OFF.getValue().equals(isOpenEncrypt)) { po.setResultValue(AESEncryptUtil.closeEncryptSetting(po.getResultValue())); + po.setOriginResultValue(AESEncryptUtil.closeEncryptSetting(po.getOriginResultValue())); } else { po.setResultValue(AESEncryptUtil.encrypt(po.getResultValue())); + po.setOriginResultValue(AESEncryptUtil.encrypt(po.getOriginResultValue())); } }); List> partition = Lists.partition(salaryAcctResultPos, 50);