From d98af68f2ea108254ec362ac2497fd619e6dd3eb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 13 一月 2026 18:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysBannerServiceImpl.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysBannerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysBannerServiceImpl.java
index 5083fdf..fe7cfc7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysBannerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysBannerServiceImpl.java
@@ -56,30 +56,32 @@
return pageInfo;
}
for (TSysBannerVO sysBannerVO : list) {
- switch (sysBannerVO.getJumpType()){
- case 2:
- TSysEducationalInfo educationalInfo = sysEducationalInfoMapper.selectById(sysBannerVO.getContentId());
- if(Objects.nonNull(educationalInfo)){
- sysBannerVO.setContentName(educationalInfo.getInfoTitle());
- }
- break;
- case 3:
- TSysLive sysLive = sysLiveMapper.selectById(sysBannerVO.getContentId());
- if(Objects.nonNull(sysLive)){
- sysBannerVO.setContentName(sysLive.getLiveTitle());
- }
- break;
- case 4:
- TSysProductIntroduction sysProductIntroduction = sysProductIntroductionMapper.selectById(sysBannerVO.getContentId());
- if(Objects.nonNull(sysProductIntroduction)){
- sysBannerVO.setContentName(sysProductIntroduction.getProductName());
- }
- break;
- case 5:
- TSysActivity sysActivity = sysActivityMapper.selectById(sysBannerVO.getContentId());
- if(Objects.nonNull(sysActivity)){
- sysBannerVO.setContentName(sysActivity.getActivityName());
- }
+ if(Objects.nonNull(sysBannerVO.getJumpType())){
+ switch (sysBannerVO.getJumpType()){
+ case 2:
+ TSysEducationalInfo educationalInfo = sysEducationalInfoMapper.selectById(sysBannerVO.getContentId());
+ if(Objects.nonNull(educationalInfo)){
+ sysBannerVO.setContentName(educationalInfo.getInfoTitle());
+ }
+ break;
+ case 3:
+ TSysLive sysLive = sysLiveMapper.selectById(sysBannerVO.getContentId());
+ if(Objects.nonNull(sysLive)){
+ sysBannerVO.setContentName(sysLive.getLiveTitle());
+ }
+ break;
+ case 4:
+ TSysProductIntroduction sysProductIntroduction = sysProductIntroductionMapper.selectById(sysBannerVO.getContentId());
+ if(Objects.nonNull(sysProductIntroduction)){
+ sysBannerVO.setContentName(sysProductIntroduction.getProductName());
+ }
+ break;
+ case 5:
+ TSysActivity sysActivity = sysActivityMapper.selectById(sysBannerVO.getContentId());
+ if(Objects.nonNull(sysActivity)){
+ sysBannerVO.setContentName(sysActivity.getActivityName());
+ }
+ }
}
}
pageInfo.setRecords(list);
--
Gitblit v1.7.1