Merge branch 'feat-1001584' into 'master'

修改生产bug

See merge request rays/pcloud-book!178

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

@@ -1117,10 +1117,12 @@ public class BookBizImpl implements BookBiz {
     public PageBean listPage4Agent(PageParam pageParam, Map<String, Object> paramMap, Long agentId) {
         LOGGER.info("书刊列表-出版端,<START>.[paramMap]=" + paramMap + ",agentId" + agentId);
         List<Long> adviserIds = adviserConsr.getIdsByNameAndAgentId(agentId, (String) paramMap.get("bookName"));
+        List<Long> agent4AdviserIds = adviserConsr.getIdsByNameAndAgentId(agentId, null);
         paramMap.put("adviserIds", adviserIds);
-        /*if (ListUtils.isEmpty(adviserIds)) {
+        paramMap.put("agent4AdviserIds", agent4AdviserIds);
+        if (ListUtils.isEmpty(agent4AdviserIds)) {
             return new PageBean(0, 0, new ArrayList<>());
-        }*/
+        }
         PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listPage4Agent");
         if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
             return new PageBean();

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

@@ -1075,6 +1075,11 @@
 			BOOK B
 		ON
 			A.BOOK_ID = B.BOOK_ID  AND A.IS_DELETE = 0 AND B.IS_DELETE = 0
+		AND
+		A.ADVISER_ID IN
+		<foreach collection="agent4AdviserIds" index="i" item="item" open="(" separator="," close=")">
+			${item}
+		</foreach>
 		AND A.IS_MAIN_EDITOR = 1
 		LEFT JOIN
 			BOOK_TYPE T