From 3a128a4c5be86862673e1dff9ecbc0b7afe7ec1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 9 Oct 2024 14:59:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SalaryStatisticsReportWrapper.java        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 7556b7bf8..22fb6261f 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -332,28 +332,28 @@ public class SalaryStatisticsReportWrapper extends Service {
         if (empDimensionOptional.isPresent()) {
             empDimensionId = empDimensionOptional.get();
         }
-//        if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
-//            //报表中缓存的条件
-//            salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
-//            if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
-//                Map<String, Object> result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
-//                if (param.getDimensionId().equals(empDimensionId)) {
-//                    // 人员维度需要分页
-//                    Map<String, Object> finalResultMap = new HashMap<>();
-//                    PageInfo<Map<String, Object>> pageInfo = (PageInfo<Map<String, Object>>) result.get("pageInfo");
-//                    PageInfo<Map<String, Object>> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
-//                    finalPageInfo.setTotal(pageInfo.getList().size());
-//                    finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
-//                    finalResultMap.put("pageInfo", finalPageInfo);
-//                    finalResultMap.put("columns", result.get("columns"));
-//                    finalResultMap.put("countResult", result.get("countResult"));
-//                    finalResultMap.put("reportId", id);
-//                    return finalResultMap;
-//                }
-//
-//                return result;
-//            }
-//        }
+        if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
+            //报表中缓存的条件
+            salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
+            if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
+                Map<String, Object> result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
+                if (param.getDimensionId().equals(empDimensionId)) {
+                    // 人员维度需要分页
+                    Map<String, Object> finalResultMap = new HashMap<>();
+                    PageInfo<Map<String, Object>> pageInfo = (PageInfo<Map<String, Object>>) result.get("pageInfo");
+                    PageInfo<Map<String, Object>> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
+                    finalPageInfo.setTotal(pageInfo.getList().size());
+                    finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
+                    finalResultMap.put("pageInfo", finalPageInfo);
+                    finalResultMap.put("columns", result.get("columns"));
+                    finalResultMap.put("countResult", result.get("countResult"));
+                    finalResultMap.put("reportId", id);
+                    return finalResultMap;
+                }
+
+                return result;
+            }
+        }
 
 
         // 列表data