bug修改

无关风月

3 天以前 5de4a49148636dce6568d37e4c62039934b0a188

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

@@ -18,6 +18,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -63,13 +64,15 @@
        }

        query.setIds(integers);
        List<SubjectVO> list =  service.listAll(query);
        List<SubjectVO> list =  service.listAll(query,res);
        Map<Integer, String> categoryMap = categoryService.list(null).stream()
                .collect(Collectors.toMap(TCategory::getId, TCategory::getName));
        for (SubjectVO subjectVO : list) {
            if (subjectVO.getFirstCategory()!=null&&subjectVO.getSecondCategory()!=null){
                TCategory byId1 = categoryService.getById(subjectVO.getFirstCategory());
                TCategory byId2 = categoryService.getById(subjectVO.getSecondCategory());
                String byId1 = categoryMap.get(subjectVO.getFirstCategory());
                String byId2 = categoryMap.get(subjectVO.getSecondCategory());
                if (byId1!=null&& byId2!=null){
                    subjectVO.setCategoryName(byId1.getName()+"-"+byId2.getName());
                    subjectVO.setCategoryName(byId1+"-"+byId2);
                }
            }
//            StringBuilder stringBuilder = new StringBuilder("");
@@ -88,7 +91,6 @@
//            subjectVO.setType(substring);
        }
        res.setRecords(list);
        res.setTotal(list.size());
        return R.ok(res);
    }
    @PostMapping("/add")