From e949122b37ecfc4438676570f809e9348730fe8f Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Tue, 26 Aug 2025 09:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=94=B6=E8=B4=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/service/impl/CostCarChargeServiceImpl.java | 3 ++- .../ruoyi-nacos/src/main/resources/application.properties | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java index ca8efbed..993f144f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java @@ -81,8 +81,9 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); // List residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList()); // List remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList); + List residentPeoplelist = residentPersonMapper.selectList(); - List roomNames = roomService.queryRoomNameList(idList); +// List roomNames = roomService.queryRoomNameList(idList); result.getRecords().stream().forEach(s -> { if (CollUtil.isNotEmpty(residentPeoplelist)) { ResidentPerson residentPerson = residentPeoplelist.stream() diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties index ef3ece6a..40aba4ad 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties @@ -40,9 +40,9 @@ spring.sql.init.platform=mysql db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://10.20.1.65:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.url.0=jdbc:mysql://192.168.159.129:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root -db.password.0=By@2025! +db.password.0=123456 ### the maximum retry times for push nacos.config.push.maxRetryTime=50