Merge remote-tracking branch 'origin/master'

无关风月

2026-01-13 d98af68f2ea108254ec362ac2497fd619e6dd3eb

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