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