Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-23 f5e1051a7e6d3ffccc815a631d8be372d772c58f

 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);
    }
}