--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/animationlibrary/AnimationLibraryController.java

@@ -286,8 +286,8 @@ public class AnimationLibraryController {
 	}
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 	
 	@ApiOperation(value = "添加附件", notes = "添加附件")

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

@@ -294,8 +294,8 @@ public class ArticleLibraryController {
 	}
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 	
 	@ApiOperation(value = "添加附件", notes = "添加附件")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/audiolibrary/AudioLibraryController.java

@@ -289,8 +289,8 @@ public class AudioLibraryController {
 	
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 	
 	@ApiOperation(value = "添加附件", notes = "添加附件")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/clauseLibrary/ClauseLibraryController.java

@@ -238,8 +238,8 @@ public class ClauseLibraryController {
 	
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 
 	@ApiOperation(value = "批量删除", notes = "批量删除")

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java

@@ -290,8 +290,8 @@ public class ImageLibraryController {
 	}
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 	@ApiOperation(value = "添加附件", notes = "添加附件")
 	@PostMapping(value = ResourceRequestPath.SAVE_ATTACHMENT)

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdflibrary/PdfLibraryController.java

@@ -286,7 +286,7 @@ public class PdfLibraryController {
 	}
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java

@@ -284,8 +284,8 @@ public class VideoLibraryController {
 	}
 	@ApiOperation(value = "批量删除关联资源", notes = "批量删除")
 	@PostMapping(value = ResourceRequestPath.BATCH_RELATION_DELETE)
-	public CallBack<Boolean> deleteByResourceIds(@RequestBody BatchDeleteForm form) {
-		return CallBack.success(resourceService.batchDeleteResource(form));
+	public CallBack<Boolean> deleteByResourceIds(@RequestBody List<String> ids) {
+		return CallBack.success(resourceService.batchDeleteResource(ids));
 	}
 	@ApiOperation(value = "添加附件", notes = "添加附件")
 	@PostMapping(value = ResourceRequestPath.SAVE_ATTACHMENT)

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/animationlibrary/AnimationResourceService.java

@@ -26,5 +26,5 @@ public interface AnimationResourceService extends BaseService<AnimationResource,
 	 * @author rjc
 	 * @date: 2019年2月15日 下午4:57:06
 	 */
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/animationlibrary/AnimationResourceServiceImpl.java

@@ -41,11 +41,11 @@ public class AnimationResourceServiceImpl extends BaseServiceImpl<AnimationResou
 		return animationResourceMapper.queryByIdAndResourceType(entity);
 	}
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<AnimationResource> list = animationResourceMapper.selectByExample(example);
 		for (AnimationResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleResourceService.java

@@ -20,5 +20,5 @@ public interface ArticleResourceService extends BaseService<ArticleResource, Int
 	 */
 	List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity, PageParam pageParam);
 
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleResourceServiceImpl.java

@@ -43,11 +43,11 @@ public class ArticleResourceServiceImpl extends BaseServiceImpl<ArticleResource,
 	}
 
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<ArticleResource> list = articleResourceMapper.selectByExample(example);
 		for (ArticleResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioResourceService.java

@@ -26,5 +26,5 @@ public interface AudioResourceService extends BaseService<AudioResource, Integer
 	 * @author rjc
 	 * @date: 2019年2月15日 下午4:07:51
 	 */
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioResourceServiceImpl.java

@@ -41,11 +41,11 @@ public class AudioResourceServiceImpl extends BaseServiceImpl<AudioResource, Int
 		return audioResourceapper.queryByIdAndResourceType(entity);
 	}
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<AudioResource> list = audioResourceapper.selectByExample(example);
 		for (AudioResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/clauseLibrary/ClauseResourceService.java

@@ -23,5 +23,5 @@ public interface ClauseResourceService extends BaseService<ClauseResource, Integ
 	List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity, PageParam pageParam);
 
 	/** 删除相关资源*/
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/clauseLibrary/ClauseResourceServiceImpl.java

@@ -43,11 +43,11 @@ public class ClauseResourceServiceImpl extends BaseServiceImpl<ClauseResource, I
 	}
 	
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<ClauseResource> list = mapper.selectByExample(example);
 		for (ClauseResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/coursewarelibrary/CoursewareResourceService.java

@@ -27,5 +27,5 @@ public interface CoursewareResourceService extends BaseService<CoursewareResourc
 	 * @author rjc
 	 * @date: 2019年2月15日 下午5:20:48
 	 */
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/coursewarelibrary/CoursewareResourceServiceImpl.java

@@ -44,11 +44,11 @@ public class CoursewareResourceServiceImpl extends BaseServiceImpl<CoursewareRes
 	}
 
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<CoursewareResource> list = coursewareResourceMapper.selectByExample(example);
 		for (CoursewareResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/imagelibrary/ImageResourceService.java

@@ -27,5 +27,5 @@ public interface ImageResourceService extends BaseService<ImageResource, Integer
 	 * @author rjc
 	 * @date: 2019年2月15日 下午5:20:48
 	 */
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/imagelibrary/ImageResourceServiceImpl.java

@@ -41,11 +41,11 @@ public class ImageResourceServiceImpl extends BaseServiceImpl<ImageResource, Int
 		return imageResourceMapper.queryByIdAndResourceType(entity);
 	}
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<ImageResource> list = imageResourceMapper.selectByExample(example);
 		for (ImageResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdflibrary/PdfResourceService.java

@@ -26,5 +26,5 @@ public interface PdfResourceService extends BaseService<PdfResource, Integer> {
 	 * @author rjc
 	 * @date: 2019年2月15日 下午4:22:22
 	 */
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/pdflibrary/PdfResourceServiceImpl.java

@@ -41,11 +41,11 @@ public class PdfResourceServiceImpl extends BaseServiceImpl<PdfResource, Integer
 		return pdfResourceMapper.queryByIdAndResourceType(entity);
 	}
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<PdfResource> list = pdfResourceMapper.selectByExample(example);
 		for (PdfResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/statuteLibrary/StatuteResourceService.java

@@ -25,5 +25,5 @@ public interface StatuteResourceService extends BaseService<StatuteResource, Int
 	List<ResourceRelationVo> queryByIdAndResourceType(QueryResourceRelationForm entity, PageParam pageParam);
 
 	/** 删除相关资源*/
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/statuteLibrary/StatuteResourceServiceImpl.java

@@ -43,11 +43,11 @@ public class StatuteResourceServiceImpl extends BaseServiceImpl<StatuteResource,
 	}
 
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<StatuteResource> list = mapper.selectByExample(example);
 		for (StatuteResource entity : list) {
 			entity.setId(entity.getId());

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoResourceService.java

@@ -26,5 +26,5 @@ public interface VideoResourceService extends BaseService<VideoResource, Integer
 	 * @author rjc
 	 * @date: 2019年2月15日 下午4:16:02
 	 */
-	boolean batchDeleteResource(BatchDeleteForm form);
+	boolean batchDeleteResource(List<String> ids);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoResourceServiceImpl.java

@@ -48,11 +48,11 @@ public class VideoResourceServiceImpl extends BaseServiceImpl<VideoResource, Int
 	 * @date: 2019年2月15日 下午4:15:00
 	 */
 	@Override
-	public boolean batchDeleteResource(BatchDeleteForm form) {
-		if (form.getIds().size() == 0) {
+	public boolean batchDeleteResource(List<String> ids) {
+		if (ids==null) {
 			throw new BaseException(-7,"没有选中任何数据，请重新选择");
 		}
-		createCriteria().andIn("id", form.getIds());
+		createCriteria().andIn("id", ids);
 		List<VideoResource> list = videoResourceMapper.selectByExample(example);
 		for (VideoResource entity : list) {
 			entity.setId(entity.getId());