From 3dc5cc3a44e3decdf8328ed33d5d46b22e586dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 10 Nov 2023 14:22:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/report/entity/bo/SalaryStatisticsReportBO.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
index 88adfe57d..10e42f83a 100644
--- a/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
+++ b/src/com/engine/salary/report/entity/bo/SalaryStatisticsReportBO.java
@@ -597,7 +597,7 @@ public class SalaryStatisticsReportBO {
      * @param sameDetail
      */
     private static void calculate4Frequent(Map<String, String> result, SalaryStatisticsItemPO item, List<Map<String, String>> nowDetail, List<Map<String, String>> lastDetail, List<Map<String, String>> sameDetail) {
-        SalaryStatisticsItemRuleDTO frequentRule = JSON.parseObject(item.getOldRule(), SalaryStatisticsItemRuleDTO.class);
+        SalaryStatisticsItemRuleDTO frequentRule = JSON.parseObject(item.getFrequentRule(), SalaryStatisticsItemRuleDTO.class);
         if (frequentRule == null || frequentRule.getTotalValue() != 1) {
             return;
         }
@@ -631,7 +631,7 @@ public class SalaryStatisticsReportBO {
      * @param sameDetail
      */
     private static void calculate4Tile(Map<String, String> result, SalaryStatisticsItemPO item, List<Map<String, String>> nowDetail, List<Map<String, String>> lastDetail, List<Map<String, String>> sameDetail) {
-        SalaryStatisticsItemRuleDTO tileRule = JSON.parseObject(item.getOldRule(), SalaryStatisticsItemRuleDTO.class);
+        SalaryStatisticsItemRuleDTO tileRule = JSON.parseObject(item.getTileRule(), SalaryStatisticsItemRuleDTO.class);
         if (tileRule == null || tileRule.getTotalValue() != 1) {
             return;
         }