diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppController.java b/src/main/java/com/sqx/modules/app/controller/app/AppController.java index b32d7e2c..b9f04786 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppController.java @@ -153,7 +153,7 @@ public class AppController { authErrMsg = "实名修改失败: 账号每月可修改次数已用完,请联系管理员"; } - if (authErrMsg == null && !ApiAccessLimitUtil.isAccessAllowed(certName, "updateAuthCertInfoByIdCard", 1, "month")) { + if (authErrMsg == null && !ApiAccessLimitUtil.isAccessAllowed(certNum, "updateAuthCertInfoByIdCard", 1, "month")) { authErrMsg = "实名修改失败: 此身份证信息次月已绑定过,请联系管理员"; } @@ -166,7 +166,7 @@ public class AppController { userInfoService.update(userInfo, new LambdaQueryWrapper().eq(UserInfo::getUserId, userId)); }catch (Exception e) { ApiAccessLimitUtil.removeKey(String.valueOf(userId), "updateAuthCertInfo"); - ApiAccessLimitUtil.removeKey(certName, "updateAuthCertInfoByIdCard"); + ApiAccessLimitUtil.removeKey(certNum, "updateAuthCertInfoByIdCard"); authErrMsg = "实名修改失败: 身份证信息不匹配"; } } diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 479b59f6..40a2a5ff 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -669,11 +669,13 @@ public class OrdersServiceImpl extends ServiceImpl implements List orders = baseMapper.selectOrdersByOrdersNo(ordersNo, status, userId, courseId, flag, time, userName, ordersType, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), sysUserId, qdCode, sysUserName); Set courseIds = orders.stream().map(Orders::getCourseId).collect(Collectors.toSet()); - List courses = courseDao.selectBatchIds(courseIds); - Map map = courses.stream().collect(Collectors.toMap(Course::getCourseId, Course::getTitle)); - orders.parallelStream().forEach(s -> { - s.setTitle(map.get(s.getCourseId())); - }); + if(CollUtil.isNotEmpty(courseIds)) { + List courses = courseDao.selectBatchIds(courseIds); + Map map = courses.stream().collect(Collectors.toMap(Course::getCourseId, Course::getTitle)); + orders.parallelStream().forEach(s -> { + s.setTitle(map.get(s.getCourseId())); + }); + } PageInfo pageInfo = new PageInfo<>(orders); return Result.success().put("data", PageUtils.page(pageInfo)); }