From 2c468ace98ce03120175b79f1243c5b73ffbe3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=BF=94?= Date: Wed, 6 May 2026 14:17:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(db):=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BD=BF=E7=94=A8=20QueryUtil.getQuery=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20getQueryAll?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SysExceptionLogRepository 和 SysLoginLogRepository 中 getQuery 改为 getQueryAll 以正确查询包含软删除记录的日志数据； 补充开发环境 PostgreSQL 数据源配置。 --- .../manage-app/src/main/resources/application-dev.yml | 5 +++++ .../manage/db/repository/SysExceptionLogRepository.java | 4 ++-- .../novalon/manage/db/repository/SysLoginLogRepository.java | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/novalon-manage-api/manage-app/src/main/resources/application-dev.yml b/novalon-manage-api/manage-app/src/main/resources/application-dev.yml index 81f2223..c7052e4 100644 --- a/novalon-manage-api/manage-app/src/main/resources/application-dev.yml +++ b/novalon-manage-api/manage-app/src/main/resources/application-dev.yml @@ -11,6 +11,11 @@ spring: max-idle-time: 10m max-life-time: 30m acquire-timeout: 3s + datasource: + url: jdbc:postgresql://localhost:55432/manage_system + username: novalon + password: novalon123 + driver-class-name: org.postgresql.Driver flyway: enabled: true locations: classpath:db/migration diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java index e991707..e9a7256 100644 --- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java +++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java @@ -51,7 +51,7 @@ public class SysExceptionLogRepository implements ISysExceptionLogRepository { SysExceptionLogQueryCriteria criteria = new SysExceptionLogQueryCriteria(); criteria.setUsername(username); - Query dbQuery = QueryUtil.getQuery(criteria); + Query dbQuery = QueryUtil.getQueryAll(criteria); Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); dbQuery = dbQuery.sort(sort); @@ -107,7 +107,7 @@ public class SysExceptionLogRepository implements ISysExceptionLogRepository { criteria.setKeyword(keyword); } - Query queryObj = QueryUtil.getQuery(criteria); + Query queryObj = QueryUtil.getQueryAll(criteria); Sort sortObj = Sort.unsorted(); if (sort != null && !sort.isEmpty()) { diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java index b0b2649..1e465b7 100644 --- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java +++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java @@ -50,10 +50,10 @@ public class SysLoginLogRepository implements ISysLoginLogRepository { SysLoginLogQueryCriteria criteria = new SysLoginLogQueryCriteria(); criteria.setUsername(username); - Query dbQuery = QueryUtil.getQuery(criteria); + Query dbQuery = QueryUtil.getQueryAll(criteria); Sort sort = Sort.by(Sort.Direction.DESC, "loginTime"); dbQuery = dbQuery.sort(sort); - + return r2dbcEntityTemplate.select(SysLoginLogEntity.class) .matching(dbQuery) .all() @@ -112,7 +112,7 @@ public class SysLoginLogRepository implements ISysLoginLogRepository { criteria.setKeyword(keyword); } - Query queryObj = QueryUtil.getQuery(criteria); + Query queryObj = QueryUtil.getQueryAll(criteria); Sort sortObj = Sort.unsorted(); if (sort != null && !sort.isEmpty()) {