bug修改

无关风月

2024-07-03 0b24c13e3de201d5b2efbb086b3eedb29a5c6fbb

bug修改

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -1814,12 +1814,17 @@
    public R<IPage<TIntegralRecord>> integralDetailParent(String time,
                                                          @RequestParam("pageNum") Integer pageNum,
                                                          @RequestParam("pageSize") Integer pageSize) {
        System.err.println("页码" + pageNum);
        System.err.println("页数" + pageSize);
        if (tokenService.getLoginUser1() == null) {
            return R.tokenError("登录失效");
        }
        return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
        IPage<TIntegralRecord> page = integralRecordService.integralDetail(new Page<>(pageNum, pageSize),
                tokenService.getLoginUserStudy().getUserid(), time);
        for (TIntegralRecord record : page.getRecords()) {
            if (!record.getIntegral().startsWith("-")) {
                record.setIntegral("+" + record.getIntegral());
            }
        }
        return R.ok(page);
    }

    /**

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java

@@ -29,15 +29,8 @@

    @Override
    public IPage<TIntegralRecord> integralDetail(Page<TIntegralRecord> page, Integer userId, String time) {
        IPage<TIntegralRecord> tIntegralRecordIPage = baseMapper.integralDetail(userId, time, page);
        List<TIntegralRecord> records = tIntegralRecordIPage.getRecords();
        for (TIntegralRecord record : records) {
            if (!record.getIntegral().equals("0") && (!record.getIntegral().contains("-"))){
                record.setIntegral("+" + record.getIntegral());
            }
        }
        tIntegralRecordIPage.setRecords(records);
        return tIntegralRecordIPage;

        return baseMapper.integralDetail(userId, time, page);
    }

    @Override