编辑端-合并查询

pcloud-facade-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -252,6 +252,7 @@ public interface BookFacade {
 			@ApiImplicitParam(name = "templetId", value = "图书类型标识", dataType = "long", paramType = "query")})
 	@RequestMapping(value = "listPage4Adviser", method = RequestMethod.GET)
 	public ResponseDto<PageBean> getListPage4Adviser(@RequestHeader("token") String token,
+			@RequestParam(value = "name", required = false) String name,
 			@RequestParam(value = "bookName", required = false) String bookName,
 			@RequestParam(value = "isbn", required = false) String isbn,
 			@RequestParam(value = "channelId", required = false) Long channelId,

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -235,6 +235,7 @@ public class BookFacadeImpl implements BookFacade {
 	@Override
 	@RequestMapping(value = "listPage4Adviser", method = RequestMethod.GET)
 	public ResponseDto<PageBean> getListPage4Adviser(@RequestHeader("token") String token,
+			@RequestParam(value = "name", required = false) String name,
 			@RequestParam(value = "bookName", required = false) String bookName,
 			@RequestParam(value = "isbn", required = false) String isbn,
 			@RequestParam(value = "channelId", required = false) Long channelId,
@@ -255,8 +256,9 @@ public class BookFacadeImpl implements BookFacade {
 		paramMap.put("isMainEditor", isMainEditor);
 		paramMap.put("isFundSupport", isFundSupport);
 		paramMap.put("channelId", channelId);
-		paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);
 		paramMap.put("bookName", bookName != null && "".equals(bookName.trim()) ? null : bookName);
+		paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);
+		paramMap.put("name", name != null && "".equals(name.trim()) ? null : name);
 		paramMap.put("typeCode", typeCode != null && "".equals(typeCode.trim()) ? null : typeCode);
 		paramMap.put("bookId", bookId);
 		paramMap.put("templetId", templetId);

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -460,7 +460,10 @@
 		AND
 			B.ISBN LIKE CONCAT(#{isbn},'%')
 		</if>
-
+		<if test="name != null">
+		  AND
+			(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%'))
+		</if>
 		<if test="isMainEditor != null">
 		  AND
 			A.IS_MAIN_EDITOR = 1