From 4fa7f9a5e73f0184f5c88b8dd4c8cbd8b8bd40a7 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 14 Dec 2022 14:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E7=AE=97-=E5=8A=A0=E8=A7=A3=E5=AF=86?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/salaryacct/SalaryAcctResultMapper.xml  | 9 +++++++++
 .../sys/service/impl/SalarySysConfServiceImpl.java       | 2 ++
 2 files changed, 11 insertions(+)

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 @@
                     </if>
                 </foreach>
             </trim>
+
+            <trim prefix="origin_result_value =case" suffix="end,">
+                <foreach collection="collection" item="item" index="index">
+                    <if test="item.originResultValue!=null">
+                        when id=#{item.id} then #{item.originResultValue}
+                    </if>
+                </foreach>
+            </trim>
+
             <trim prefix="delete_type =case" suffix="end,">
                 <foreach collection="collection" item="item" index="index">
                     <if test="item.deleteType!=null">
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<List<SalaryAcctResultPO>> partition = Lists.partition(salaryAcctResultPos, 50);