feat：系列

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/controller/frontend/EbookController.java

@@ -112,7 +112,7 @@ public class EbookController {
             vo.setDiscount(info.getDiscountOrRealPrice().multiply(new BigDecimal(10)));
         }*/
         // 目录
-        List<ChapterLibrary> chapterList = this.getDirectory(null, oid);
+        /*List<ChapterLibrary> chapterList = this.getDirectory(null, oid);
         vo.setChapterList(chapterList);
         LambdaQueryWrapper<ChapterLibrary> chapterLibraryLambdaQueryWrapper = new LambdaQueryWrapper<>();
         chapterLibraryLambdaQueryWrapper.eq(ChapterLibrary::getBookId, oid);
@@ -120,7 +120,7 @@ public class EbookController {
         List<ChapterLibrary> list = clService.list(chapterLibraryLambdaQueryWrapper);
         if (!list.isEmpty()) {
             vo.setMarkid(list.get(0).getMarkId());
-        }
+        }*/
         // 保存浏览记录
        // recordService.saveOrUpdateRecord(oid, AllResourceTypeEnum.EBOOK.getCode());
         // 更新浏览量

wyszyk-provider/wyszyk-provider-resource/src/main/java/com/zrqx/resource/service/impl/ProjectLibraryServiceImpl.java

@@ -427,7 +427,9 @@ public class ProjectLibraryServiceImpl extends ServiceImpl<ProjectLibraryMapper,
                     p.setCover((String) map.get("cover"));
                     p.setResourceName((String) map.get("name"));
                     ProjectDiyModel projectDiyModel = diyModelService.getById(p.getDiyModelId());
-                    p.setDiyModeName(projectDiyModel.getName());
+                    if(projectDiyModel!=null){
+                        p.setDiyModeName(projectDiyModel.getName());
+                    }
                 })
                 .collect(Collectors.toList())
         );