Merge branch 'feat-1001584' into 'master'

1001584-----------出版端设计规范更新

See merge request rays/pcloud-book!167

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

@@ -1116,11 +1116,11 @@ public class BookBizImpl implements BookBiz {
     @Override
     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("mainEditorName"));
+        List<Long> adviserIds = adviserConsr.getIdsByNameAndAgentId(agentId, (String) paramMap.get("bookName"));
         paramMap.put("adviserIds", adviserIds);
-        if (ListUtils.isEmpty(adviserIds)) {
+        /*if (ListUtils.isEmpty(adviserIds)) {
             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,11 +1075,6 @@
 			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="adviserIds" index="i" item="item" open="(" separator="," close=")">
-				${item}
-			</foreach>
 		AND A.IS_MAIN_EDITOR = 1
 		LEFT JOIN
 			BOOK_TYPE T
@@ -1100,8 +1095,16 @@
 			A.CHANNEL_ID = #{channelId}
 		</if>
 		<if test="bookName!=null">
-		AND
-			B.BOOK_NAME LIKE CONCAT('%',#{bookName},'%')
+		AND (B.BOOK_NAME LIKE CONCAT('%',#{bookName},'%')
+			OR B.ISBN LIKE CONCAT(#{bookName},'%')
+			<if test="adviserIds!=null and adviserIds.size()>0">
+				OR
+				A.ADVISER_ID in
+				<foreach collection="adviserIds" item="item" open="(" separator="," close=")">
+					${item}
+				</foreach>
+			</if>
+			)
 		</if>
 		<if test="isbn!=null">
 		AND