From c275b1a912c2ffb7cbd72a5f144e8645972cec02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 10:02:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=AE=9E=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/app/controller/app/AppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..637226af 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 = "实名修改失败: 此身份证信息次月已绑定过,请联系管理员"; } From fcc3b84d06f027cd94431a76fc941c3c5b0a1c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 10:06:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=AE=9E=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sqx/modules/app/controller/app/AppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 637226af..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 @@ -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 = "实名修改失败: 身份证信息不匹配"; } } From 6d12251b3980c2aad87cbe83d1b73f3f30b0da2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 7 Jan 2025 10:08:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orders/service/impl/OrdersServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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)); }