From 4f8606b00ee4311c09848fa62f183b56f6fa9940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Sat, 16 Dec 2023 12:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AF=86=E5=88=AB=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/report/wrapper/SalaryStatisticsReportWrapper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index ce270b1fa..86b7aeb7d 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -216,6 +216,7 @@ public class SalaryStatisticsReportWrapper extends Service {
 
     /**
      * 复制薪资账套
+     *
      * @param id
      */
     public void duplicate(Long id) {
@@ -322,7 +323,7 @@ public class SalaryStatisticsReportWrapper extends Service {
             //报表中缓存的条件
             salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
             if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
-                return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5);
+                return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
             }
         }
 
@@ -346,7 +347,7 @@ public class SalaryStatisticsReportWrapper extends Service {
 
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_IDS, salaryReportIds + "," + id);
         getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id, salaryReportConditions + "," + paramMd5);
-        getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + paramMd5, resultMap);
+        getSalaryCacheService(user).set(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5, resultMap);
 
 
         return resultMap;