Merge branch 'fix-zp-1002692new' into 'master'

1002692 查询本编辑下的书刊

See merge request rays/pcloud-book!632

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -643,7 +643,7 @@ public interface BookBiz {
 	 */
     void updateBookQualifyInfo(BookQualifyInfoVO bookQualifyInfo, Long adviserId);
 
-	PageBeanNew<BookQualifyVO> getAddBookQualifyList(Integer currentPage, Integer numPerPage, String name,Integer isShowQualifyInfo);
+	PageBeanNew<BookQualifyVO> getAddBookQualifyList(Integer currentPage, Integer numPerPage, String name,Integer isShowQualifyInfo,Long adviserId);
 
 	SearchBookVO getBookInfoByBookGroupId(Long bookGroupId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java

@@ -2085,10 +2085,11 @@ public class BookBizImpl implements BookBiz {
     }
 
     @Override
-    public PageBeanNew<BookQualifyVO> getAddBookQualifyList(Integer currentPage, Integer numPerPage, String name, Integer isShowQualifyInfo) {
+    public PageBeanNew<BookQualifyVO> getAddBookQualifyList(Integer currentPage, Integer numPerPage, String name, Integer isShowQualifyInfo,Long adviserId) {
         Map<String, Object> paramMap = new HashMap<>();
             paramMap.put("isShowQualifyInfo", isShowQualifyInfo);
             paramMap.put("name", name);
+            paramMap.put("adviserId", adviserId);
             PageBeanNew<BookQualifyVO> pageBeanNew = bookDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "getAddBookQualifyList");
             if (null==pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())){
                 return new PageBeanNew<>(currentPage,numPerPage,0,new ArrayList<>());

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

@@ -1016,8 +1016,8 @@ public class BookFacadeImpl implements BookFacade {
             @RequestParam(value = "name", required = false) String name,
             @RequestParam(value = "isShowQualifyInfo", required = false) Integer isShowQualifyInfo
     ) throws PermissionException, JsonParseException, BizException{
-        Long channelId = (Long) SessionUtil.getVlaue(token,SessionUtil.PARTY_ID);
-        PageBeanNew<BookQualifyVO> pageBean = bookBiz.getAddBookQualifyList(currentPage,numPerPage,name,isShowQualifyInfo);
+        Long adviserId = (Long) SessionUtil.getVlaue(token,SessionUtil.PARTY_ID);
+        PageBeanNew<BookQualifyVO> pageBean = bookBiz.getAddBookQualifyList(currentPage,numPerPage,name,isShowQualifyInfo,adviserId);
         return new ResponseDto<>(pageBean);
     }
 

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

@@ -2208,9 +2208,11 @@
 		select a.BOOK_ID bookId,a.COVER_IMG coverImg,a.BOOK_NAME bookName,a.ISBN isbn,b.id bookGroupId ,d.resourceCount from book a
 		LEFT JOIN  book_group b on a.book_id=b.book_id
 		LEFT JOIN (select book_group_id  as bookGroupId,COUNT(1) as resourceCount from book_group_serve GROUP BY book_group_id ) d on b.id=d.bookGroupId
+		left join book_adviser c  on a.book_id=c.book_id
 		where  a.IS_DELETE=0
 		and b.is_delete=0
 		AND b.join_group_type =4
+		and c.adviser_id=#{adviserId}
 		<if test="name != null">
 			AND (a.BOOK_NAME LIKE CONCAT('%',#{name},'%') OR a.ISBN LIKE CONCAT(#{name},'%'))
 		</if>