--no commit message

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

@@ -12,6 +12,7 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,7 +40,6 @@ import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryLabel;
 import com.zrqx.core.model.resource.articlelibrary.ArticleResource;
 import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
-import com.zrqx.core.model.resource.imagelibrary.ImageLibraryLabel;
 import com.zrqx.core.model.resource.pdflibrary.PdfLibrary;
 import com.zrqx.core.model.resource.videolibrary.VideoLibrary;
 import com.zrqx.core.util.CallBack;
@@ -108,7 +108,7 @@ public class ArticleLibraryController {
 	}
 	@ApiOperation(value = "批量审核", notes = "批量审核")
 	@PostMapping(value = ResourceRequestPath.BATCH_UPDATE_STATUS)
-	public CallBack<Boolean> updateArray(@RequestBody BatchUpdateAnimationLibraryForm form) {
+	public CallBack<Boolean> updateArray(@RequestBody BatchUpdateArticleLibraryForm form) {
 		Criteria cr = articleService.createCriteria();
 		cr.andIn("id", form.getIds());
 		List<ArticleLibrary> list = articleService.selectByCriteria();

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

@@ -11,8 +11,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import tk.mybatis.mapper.entity.Example.Criteria;
-
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
@@ -20,7 +18,6 @@ import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.recycleBin.SaveResourceForm;
 import com.zrqx.core.mapper.BaseMapper;
-import com.zrqx.core.model.resource.animationlibrary.AnimationLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleGoods;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/label/LabelContentDiyTypeServiceImpl.java

@@ -56,7 +56,9 @@ public class LabelContentDiyTypeServiceImpl extends BaseServiceImpl<LabelContent
 		List<LabelAndContentByDataTypeVO> vos = new ArrayList<LabelAndContentByDataTypeVO>();
 		Label label = labelmapper.selectByPrimaryKey(oid);
 		LabelAndContentByDataTypeVO vo = new LabelAndContentByDataTypeVO();
-		BeanUtils.copyProperties(label, vo);
+		if(label!=null){
+			BeanUtils.copyProperties(label, vo);
+		
 		//查询标签内容列表
 		List<LabelContentDiyType> list = mapper.queryBylabelIds(StatisticsEnum.getName(resourceType),ids);
 		// 获取一级分类
@@ -64,6 +66,7 @@ public class LabelContentDiyTypeServiceImpl extends BaseServiceImpl<LabelContent
 		tree(list,voList);
 		vo.setList(voList);
 		vos.add(vo);
+		}
 		return vos;
 	}
 	@Override