From 9a5cc3f127db27ab6280d02534071780b170e3e5 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Thu, 18 Sep 2025 22:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=B5=E6=B1=A0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../car/service/impl/RentBatteyRuleServiceImpl.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java b/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java
index dd32755..e96d34c 100644
--- a/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java
+++ b/src/main/java/com/sczx/car/service/impl/RentBatteyRuleServiceImpl.java
@@ -1,13 +1,14 @@
 package com.sczx.car.service.impl;
 
-import com.sczx.car.convert.RentBatteyRuleConvert;
 import com.sczx.car.dto.RentBatteyRuleDTO;
-import com.sczx.car.po.RentBatteyRulePO;
 import com.sczx.car.repository.RentBatteyRuleRepo;
 import com.sczx.car.service.RentBatteyRuleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
 
 @Slf4j
 @Service
@@ -18,7 +19,11 @@ public class RentBatteyRuleServiceImpl implements RentBatteyRuleService {
 
     @Override
     public RentBatteyRuleDTO getRentBatteyRuleByBatteyRuleId(Long carRuleId) {
-        RentBatteyRulePO rentBatteyRulePO = rentBatteyRuleRepo.getById(carRuleId);
-        return RentBatteyRuleConvert.INSTANCE.poToDto(rentBatteyRulePO);
+//        RentBatteyRulePO rentBatteyRulePO = rentBatteyRuleRepo.getById(carRuleId);
+        List<RentBatteyRuleDTO> rentBatteyRuleList = rentBatteyRuleRepo.queryRentBatteyRuleByCarRuleId(carRuleId.intValue());
+        if(CollectionUtils.isEmpty(rentBatteyRuleList)){
+            return null;
+        }
+        return rentBatteyRuleList.get(0);
     }
 }