--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java

@@ -611,18 +611,15 @@ public class EbookController {
 			Example example = bookservice.createExample();
 			example.and().andEqualTo("isbn", ev.getBook().getIsbn());
 			Book book = bookservice.selectOneByExample(example);
-			String id = book.getId();
 			if (book != null){
 				Ebook ebook = ebookservice.selectByPrimaryKey(book.getId());
 				// 如果该epub已导入
 				if (StringUtils.isNotBlank(ebook.getEpubFile())){
-					BeanUtils.copyProperties(ev.getBook(), book);
-					book.setId(id);
+					BeanUtils.copyPropertiesIgnoreNotNull(ev.getBook(), book, book);
 					bookservice.updateByPrimaryKeySelective(book);
 					ebook.setUploadTime(new Date());
 					ebook.setUpdateTime(new Date());
-					BeanUtils.copyProperties(ev.getEbook(), ebook);
-					ebook.setId(id);
+					BeanUtils.copyPropertiesIgnoreNotNull(ev.getEbook(), ebook, ebook);
 					ebookservice.updateByPrimaryKeySelective(ebook);
 					try {
 						redis.delete(token);