bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java

@@ -51,9 +51,7 @@

    @Resource
    private UserIntegralChangesClient userIntegralChangesClient;
    @Autowired
    private BenefitsVideoClassificationMapper benefitsVideoClassificationMapper;
    @Autowired
    @Resource
    private BenefitsVideosMapper benefitsVideosMapper;


@@ -72,8 +70,10 @@
            wrapper.like("name", search);
        }

        List<BenefitsVideoClassification> list = benefitsVideoClassificationService.list(wrapper.orderByAsc("sort"));
        List<UserBenefitsVideos> userBenefitsVideos = userBenefitsVideosService.list(new QueryWrapper<UserBenefitsVideos>().eq("appUserId", uid));
        List<BenefitsVideoClassification> list = benefitsVideoClassificationService.list(wrapper.eq("state", 1)
                .orderByDesc("sort"));
        List<UserBenefitsVideos> userBenefitsVideos = userBenefitsVideosService.list(new QueryWrapper<UserBenefitsVideos>()
                .eq("appUserId", uid));
        List<Integer> collect = userBenefitsVideos.stream().map(UserBenefitsVideos::getBenefitsVideosId).collect(Collectors.toList());

        List<BenefitsVideoClassificationListVo> listVos = new ArrayList<>();
@@ -82,11 +82,12 @@
                BenefitsVideoClassificationListVo benefitsVideoClassificationListVo = new BenefitsVideoClassificationListVo();
                benefitsVideoClassificationListVo.setId(benefitsVideoClassification.getId());
                benefitsVideoClassificationListVo.setName(benefitsVideoClassification.getName());
                QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>().eq("state", 1).eq("benefitsVideoClassificationId", benefitsVideoClassification.getId());
                QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>()
                        .eq("state", 1).eq("benefitsVideoClassificationId", benefitsVideoClassification.getId());
                if (collect.size() > 0) {
                    benefitsVideosQueryWrapper.notIn("id", collect);
                }
                List<BenefitsVideos> list1 = this.list(benefitsVideosQueryWrapper.eq("state", 1).orderByDesc("insertTime").last(" limit 0, 4"));
                List<BenefitsVideos> list1 = this.list(benefitsVideosQueryWrapper.orderByAsc("insertTime").last(" limit 0, 4"));
                List<BenefitsVideosListVo> lists = new ArrayList<>();
                for (BenefitsVideos benefitsVideos : list1) {
                    if (benefitsVideos.getState() == 1) {
@@ -236,8 +237,8 @@
    }

    @Override
    public List<BenefitsVideos> getBenefitVideoById(Integer id) {
        return benefitsVideosMapper.getBenefitVideoById(id);
    public List<BenefitsVideos> getBenefitVideoById(Integer id, Integer state) {
        return benefitsVideosMapper.getBenefitVideoById(id, state);
    }

    @Override