Merge branch 'feature/booklist' into 'master'

平台端新增“书刊列表”菜单

See merge request rays/pcloud-book!1726

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

@@ -3868,6 +3868,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			paramAdviserIds = bookParam4PcloudVO.getAdviserIds();
 		} else if (null!=bookParam4PcloudVO.getAgentId()) {
 			paramAdviserIds = adviserConsr.getByAgentId(bookParam4PcloudVO.getAgentId());
+			if (CollUtil.isEmpty(paramAdviserIds)) {
+				return new PageBeanNew<>(currentPage,numPerPage,0,new ArrayList<>());
+			}
 		}
 		paramMap.put("adviserIds",paramAdviserIds);
 		paramMap.put("startTime",bookParam4PcloudVO.getStartTime());

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

@@ -1532,7 +1532,7 @@
 		<if test="adviserIds != null and adviserIds.size>0">
 			AND ba.ADVISER_ID in
 			<foreach collection="adviserIds" index="index" separator="," item="item" close=")" open="(">
-				#{item}
+				${item}
 			</foreach>
 		</if>
 		ORDER BY