diff --git a/src/main/java/com/peanut/modules/book/controller/BookController.java b/src/main/java/com/peanut/modules/book/controller/BookController.java index 6b95fd73..21c5b19a 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookController.java @@ -254,13 +254,15 @@ public class BookController { public R save(@RequestBody BookEntity book) { bookService.save(book); //添加图书类型关系表 - String[] types = book.getMedicaldesBookType().split(","); - if (types.length > 0) { - for (int i = 0; i < types.length; i++) { - MedicaldesBook medicaldesBook = new MedicaldesBook(); - medicaldesBook.setBookId(book.getId()); - medicaldesBook.setTypeId(Integer.parseInt(types[i])); - medicaldesBookService.save(medicaldesBook); + if (StringUtils.isNotEmpty(book.getMedicaldesBookType())){ + String[] types = book.getMedicaldesBookType().split(","); + if (types.length > 0) { + for (int i = 0; i < types.length; i++) { + MedicaldesBook medicaldesBook = new MedicaldesBook(); + medicaldesBook.setBookId(book.getId()); + medicaldesBook.setTypeId(Integer.parseInt(types[i])); + medicaldesBookService.save(medicaldesBook); + } } } return R.ok(); @@ -314,7 +316,7 @@ public class BookController { } } //再添加 - if (book.getMedicaldesBookType()!=null){ + if (StringUtils.isNotEmpty(book.getMedicaldesBookType())){ String[] types = book.getMedicaldesBookType().split(","); if (types.length > 0) { for (int i = 0; i < types.length; i++) { diff --git a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java index b3818497..eb22c9a9 100644 --- a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java +++ b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java @@ -50,6 +50,17 @@ public class MedicaldesController { return R.ok().put("result",sysDictDataService.list(wrapper)); } + /** + * 书列表 + */ + @RequestMapping(path = "/bookList") + public R bookList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + wrapper.eq(BookEntity::getBookType,0); + wrapper.orderByDesc(BookEntity::getCreateTime); + return R.ok().put("result",bookService.list(wrapper)); + } + /** * 专著出版关系列表 */ @@ -58,6 +69,7 @@ public class MedicaldesController { MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); wrapper.selectAll(MedicaldesBook.class); wrapper.leftJoin(BookEntity.class,BookEntity::getId,MedicaldesBook::getBookId); + wrapper.eq(BookEntity::getBookType,0); if (map.containsKey("dictType")&&StringUtils.isNotEmpty(map.get("dictType").toString())){ wrapper.eq(MedicaldesBook::getTypeId,map.get("dictType")); } @@ -86,6 +98,7 @@ public class MedicaldesController { wrapper.selectAll(BookEntity.class); wrapper.leftJoin(MedicaldesBook.class,MedicaldesBook::getBookId,BookEntity::getId); wrapper.eq(MedicaldesBook::getTypeId,type); + wrapper.eq(BookEntity::getBookType,0); wrapper.orderByAsc(MedicaldesBook::getSort); List list = bookService.list(wrapper); return R.ok().put("result", list);