--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgBookServiceImpl.java

@@ -85,7 +85,11 @@ public class FgBookServiceImpl extends BaseServiceImpl<Book, String> implements
 			for (FgArticleLibraryListVO vo : list) {
 				YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(vo.getYearId());
 				if(library !=null ) {
-					vo.setMainBody(library.getName()+"年第"+vo.getPeriods()+"期");	
+					if(library.getPeriods().equals("增刊")) {
+					vo.setMainBody(library.getName()+"年"+vo.getPeriods());
+					}else {
+					vo.setMainBody(library.getName()+"年第"+vo.getPeriods()+"期");
+					}
 				}
 			}
 			this.regEx1(list);

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

@@ -75,12 +75,11 @@ public class WapBookServiceImpl extends BaseServiceImpl<Book, String> implements
 		List<WapIndexEbookListVO> list = bookMapper.queryMainBody(oid);
 		
 		for(int i=0;i<list.size();i++) {
-			if(i==0) {
-				YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(list.get(i).getYearId());
-				list.get(i).setName(library.getName()+"年第"+list.get(i).getPeriods()+"期");
+			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(list.get(i).getYearId());
+			if(library.getPeriods().equals("增刊")) {
+				list.get(i).setName(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()+"期");
+			list.get(i).setName(library.getName()+"年第"+list.get(i).getPeriods()+"期");
 			}
 		}
 		
@@ -199,16 +198,16 @@ public class WapBookServiceImpl extends BaseServiceImpl<Book, String> implements
 	public List<WapIndexEbookListVO> newQueryMainBody() {
         List<WapIndexEbookListVO> list = bookMapper.newQueryMainBody();
 		
-		for(int i=0;i<list.size();i++) {
-			if(i==0) {
-				YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(list.get(i).getYearId());
-				list.get(i).setName(library.getName()+"年第"+list.get(i).getPeriods()+"期");
+    	for(int i=0;i<list.size();i++) {
+			YearLibrary library = fgYearLibraryMapper.selectByPrimaryKey(list.get(i).getYearId());
+			if(library.getPeriods().equals("增刊")) {
+				list.get(i).setName(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()+"期");
+			list.get(i).setName(library.getName()+"年第"+list.get(i).getPeriods()+"期");
 			}
 		}
 		
+		
 		this.regEx2(list);
 		return list;
 	}