--no commit message

com.zrqx.file/src/main/java/com/zrqx/file/util/BookUtil.java

@@ -124,7 +124,10 @@ public class BookUtil {
 			Set<ArticleLibrary> contentSet = new HashSet<>();
 			Map<String, String> imgtzMap = new HashMap<>();// 图片图注信息
 			Object[] data = new Object[2];
-			ebook.setAuthor(book.getAuthor());
+			if(book.getAuthor()!=null) {
+				ebook.setAuthor(book.getAuthor());
+			}
+			
 			data = er.setContent(listReferences, contentSet, ebook, imgtzMap, data);
 			ev.setArticleSet(contentSet);
 			// ************导入图书中的图片资源************

com.zrqx.file/src/main/java/com/zrqx/file/util/EpubResolve.java

@@ -466,7 +466,10 @@ public class EpubResolve {
 				
 				// 设置公共信息
 				setContentCommInfo(content, ebook, elements);
-				content.setAuthor(ebook.getAuthor());
+				if(ebook.getAuthor()!=null) {
+					content.setAuthor(ebook.getAuthor());
+				}
+				
 				// **********将章节内容存入Set集合*********
 				contentSet.add(content);
 			} else if (!anyEquals) {
@@ -525,7 +528,10 @@ public class EpubResolve {
 						setContentCommInfo(content, ebook, es);
 
 						// *********将章节内容存入Set集合****************
-						content.setAuthor(ebook.getAuthor());
+						
+						if(ebook.getAuthor()!=null) {
+							content.setAuthor(ebook.getAuthor());
+						}
 						contentSet.add(content);
 					}