--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMainBodyRelationMapper.java

@@ -16,7 +16,7 @@ public interface EbookMainBodyRelationMapper extends BaseMapper<EbookMainBodyRel
 	List<FgEbookMainBodyVO> queryByUploadAsc(String oid);
 	
 	@Select("<script>" 
-			+ "select r.id,r.yearId,r.year as name from res_ebook_main_body_relation r join res_book b where b.status=1 and r.mainBodyId = #{oid} GROUP BY r.year ORDER BY r.year desc"
+			+ "select r.id,r.yearId,r.year as name from res_ebook_main_body_relation r join res_book b on r.objectId = b.id where b.status=1 and r.mainBodyId = #{oid} GROUP BY r.year ORDER BY r.year desc"
 		    + "</script>")
 	List<FgEbookMainBodyVO> fgqueryByUploadAsc(String oid);
 }

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

@@ -70,10 +70,17 @@ public class WapBookServiceImpl extends BaseServiceImpl<Book, String> implements
 	@Override
 	public List<WapIndexEbookListVO> queryMainBody(String oid) {
 		List<WapIndexEbookListVO> list = bookMapper.queryMainBody(oid);
-		for (WapIndexEbookListVO vo : list) {
-			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYearId());
-			vo.setName(vo.getName()+"("+library.getName()+"年第"+vo.getPeriods()+"期)");
+		
+		for(int i=0;i<list.size();i++) {
+			if(i==0) {
+				YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(list.get(i).getYearId());
+				list.get(i).setName(list.get(i).getName()+"("+library.getName()+"年第"+list.get(i).getPeriods()+"期)");
+			}else {
+				YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(list.get(i).getYearId());
+				list.get(i).setName(library.getName()+"年第"+list.get(i).getPeriods()+"期");
 			}
+		}
+		
 		this.regEx2(list);
 		return list;
 	}