From 91fb5c361ab22e39b13c2f24b681d8add21e597f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com> Date: Mon, 21 Apr 2025 17:38:07 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20.gitignore=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 .vscode 目录到 IntelliJ IDEA 忽略列表 - 新增 /logs/、/ruoyi-admin/logs/ 和 /.vscode/ 目录到忽略列表 --- .gitignore | 2 ++ .../org/dromara/work/service/impl/TpCoursesServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index f061b8f..0e70380 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ target/ ### IntelliJ IDEA ### .idea .vscode +.lingma *.iws *.iml *.ipr @@ -50,3 +51,4 @@ nbdist/ /logs/ /ruoyi-admin/logs/ /.vscode/ +/.lingma/ diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpCoursesServiceImpl.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpCoursesServiceImpl.java index 909833a..52ee577 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpCoursesServiceImpl.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpCoursesServiceImpl.java @@ -90,6 +90,9 @@ public class TpCoursesServiceImpl implements ITpCoursesService { public Map queryCount(TpCoursesBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); List list = baseMapper.selectVoList(lqw); + if (list.isEmpty()) { + return new HashMap<>(); + } List orderList = orderMapper.selectList(new LambdaQueryWrapper().in(TpOrder::getCourseId, list.stream().map(TpCoursesVo::getId).toList()).ne(TpOrder::getPayState, 1)); Map map = new HashMap<>(); map.put("count", list.size());