--no commit message

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

@@ -513,8 +513,25 @@ public class EbookController {
 			if (book != null) {
 				
 				Ebook ebook = ebookservice.selectByPrimaryKey(book.getId());
+				
+				if(ebook == null) {
+					ev.getEbook().setBookStatus(0);
+					ev.getEbook().setGoodsType(GoodsTypeEnum.EBOOK.getCode());
+					ev.getEbook().setBrowseNum(50);
+					ev.getEbook().setName(ev.getBook().getName());
+					ev.getEbook().setId(book.getId());
+					// ev.getEbook().setBookType(1);
+					ev.getEbook().setPriceOption(PriceOptionEnum.STATUS_1.getCode());
+					ebookservice.insert(ev.getEbook());
+					// 图书分类关联表
+					EbookDiyType edt = new EbookDiyType();
+					edt.setEbookId(ev.getEbook().getId());
+					edt.setCode(ev.getCode());
+					edt.setDiyTypeId(ev.getDtId());
+					dtservice.insert(edt);
+				}
 				// 如果该epub已导入
-				if (StringUtils.isNotBlank(ebook.getEpubFile())) {
+				else if (StringUtils.isNotBlank(ebook.getEpubFile())) {
 					BeanUtils.copyPropertiesIgnoreNotNull(ev.getBook(), book, book);
 					bookservice.updateByPrimaryKeySelective(book);
 					ebook.setUploadTime(new Date());
@@ -528,7 +545,7 @@ public class EbookController {
 					}
 					return CallBack.success();
 				}
-				
+				if(ebook != null) {
 				// 未导入，但已存在该isbn图书,则修改该图书及章节
 				BeanUtils.copyPropertiesIgnoreNotNull(ev.getBook(), book, book);
 				bookservice.updateByPrimaryKeySelective(book);
@@ -536,6 +553,7 @@ public class EbookController {
 				ebook.setUploadTime(new Date());
 				ebook.setUpdateTime(new Date());
 				ebookservice.updateByPrimaryKeySelective(ebook);
+				}
 				// 插入文章及分类关联表
 				//查询图书关联的文章进行下架处理
 				

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

@@ -38,7 +38,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			+ "and bb.mainBodyId = #{mainBody} "
 			+ "</if>" 
 			+ "<if test='"+ NOTBLANK +"(nai)'>"
-			+ " AND (bb.name like concat('%',#{nai},'%')  or bb.executiveEditor like concat('%',#{nai},'%') OR bb.JournalCode like concat('%',#{nai},'%')) "
+			+ " AND (bb.name like concat('%',#{nai},'%')  or bb.executiveEditor like concat('%',#{nai},'%') OR bb.JournalCode like concat('%',#{nai},'%') OR bb.year like concat('%',#{nai},'%')) "
 			+ "</if>"
 		    + " order by bb.uploadTime desc "
 			+ "</script>")