From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
index 0283e71..0cadd77 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CalculateRuleServiceImpl.java
@@ -42,7 +42,7 @@
*/
@Override
public CalculateRule selectDefaultRuleById(Long id) {
- return calculateRuleMapper.selectDefaultRuleById(id);
+ return calculateRuleMapper.selectById(id);
}
/**
@@ -144,6 +144,6 @@
@Override
public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
- return TreeUtils.build(calculateRuleMapper.getRuleListByUnitId(unitId), 0L);
+ return TreeUtils.build(calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate()), 0L);
}
}
--
Gitblit v1.8.0