--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java

@@ -153,9 +153,9 @@ public class ArticleLibraryController {
 			if (entity.getStatus() == LibraryStatusEnum.STATUS_0.getCode()) {
 				throw new BusinessValidateException("待审核状态的文章不能直接操作上架状态需通过批量审核操作上架");
 			}
-			if (entity.getBookId() != null && entity.getBookId() != "") {
+			/*if (entity.getBookId() != null && entity.getBookId() != "") {
 				throw new BusinessValidateException("图书内拆分出来的文章不支持单独上、下架、删除操作");
-			}
+			}*/
 		}
 		for (ArticleLibrary entity : list) {
 			entity.setStatus(form.getStatus());

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

@@ -49,6 +49,7 @@ import com.zrqx.core.model.resource.ebook.EbookDiyType;
 import com.zrqx.core.model.resource.ebook.EbookResource;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
+import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -241,14 +242,18 @@ public class EbookController {
 		Example example = alservice.createExample();
 		example.createCriteria().andIn("bookId", ids);
 		List<ArticleLibrary> articleList = alservice.selectByExample(example);
-		List<String> articleIds = articleList.stream().map(ArticleLibrary :: getId).collect(Collectors.toList());
-		alservice.batchDelete(articleIds);
+		if(ArrayUtils.isNotEmpty(articleList)){
+			List<String> articleIds = articleList.stream().map(ArticleLibrary :: getId).collect(Collectors.toList());
+			alservice.batchDelete(articleIds);
+		}
 		// 删除图片
 		example = ilService.createExample();
 		example.createCriteria().andIn("bookId", ids);
 		List<ImageLibrary> imageList = ilService.selectByExample(example);
-		List<Integer> imageIds = imageList.stream().map(ImageLibrary :: getId).collect(Collectors.toList());
-		ilService.batchDelete(imageIds);
+		if (ArrayUtils.isNotEmpty(imageList)) {
+			List<Integer> imageIds = imageList.stream().map(ImageLibrary :: getId).collect(Collectors.toList());
+			ilService.batchDelete(imageIds);
+		}
 		return CallBack.success();
 	}
 	@ApiOperation("查询电子书列表")