8.29

liujie

4 天以前 eb9256cd2cba7a5cdf9ccbdc7919eb4652557105

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

@@ -1722,12 +1722,15 @@


//        List<String> subjectId = getSubjectId(week);

        String[] split = game.getSubjectIds().split(",");
        List<String> subjectId = new ArrayList<>();
        for (String s : split) {
            subjectId.add(s);
        String subjectIds = game.getSubjectIds();
        if(subjectIds!=null){
            String[] split = subjectIds.split(",");
            for (String s : split) {
                subjectId.add(s);
            }
        }


        List<String> newSubjectId = subjectId.stream().map(data -> {
            if (data.startsWith(Constants.REDUCE)) {
@@ -1784,11 +1787,15 @@
            throw new GlobalException("当前季度该周目暂无配置游戏数据！");
        }
//        List<String> subjectId = getSubjectId(week);
        String[] split = game.getSubjectIds().split(",");
        List<String> subjectId = new ArrayList<>();
        for (String s : split) {
            subjectId.add(s);
        String subjectIds = game.getSubjectIds();
        if(subjectIds!=null){
            String[] split = subjectIds.split(",");
            for (String s : split) {
                subjectId.add(s);
            }
        }

        List<String> subjectData = getSubjectData(game, subjectId);
        List<TSubject> subjectList = getSubjectList(subjectData);
        // 返回数据