--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/wap/service/WapBookServiceImpl.java

@@ -55,11 +55,15 @@ public class WapBookServiceImpl extends BaseServiceImpl<Book, String> implements
 	public List<FgArticleLibraryListVO> pageBook(FgQueryArticleLibraryForm form,PageParam pageParam) {
 		startPage(pageParam);
 		List<FgArticleLibraryListVO> list = bookMapper.pageBook(form);
-		for (FgArticleLibraryListVO vo : list) {
-			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYearId());
-			vo.setName("《"+vo.getMainBody()+"》"+library.getName()+"年第"+vo.getPeriods()+"期");
+		if(list.size()>0) {
+			for (FgArticleLibraryListVO vo : list) {
+				YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYearId());
+				if(library!=null) {
+					vo.setMainBody(library.getName()+"年第"+vo.getPeriods()+"期");
+				}
+			}
+			this.regEx1(list);
 		}
-		this.regEx1(list);
 		return list;
 	}