--no commit message

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

@@ -31,13 +31,11 @@ import com.zrqx.core.form.resource.bg.articlelibrary.SaveArticleRelationLibraryF
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.model.resource.ArticleLibrary;
 import com.zrqx.core.model.resource.ResourceRelation;
-import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.https.HttpClientUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryListVO;
-import com.zrqx.core.vo.resource.articlelibrary.ArticleLibraryOneVO;
 import com.zrqx.core.vo.resource.articlelibrary.ArticleStatusDateilsVO;
 import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
 import com.zrqx.resource.bg.service.articlelibrary.ResourceRelationService;
@@ -122,6 +120,30 @@ public class ArticleLibraryController {
 	@GetMapping(value = ResourceRequestPath.PAGE)
 	public CallBack<PageInfo<ArticleLibraryListVO>> page(
 			QueryArticleLibraryForm form, PageParam pageParam) {
+		PageInfo<ArticleLibraryListVO> pageInfo = articleService.page(form, pageParam);
+	/*	if(list.size()>0){
+			int i=0;
+			for (ArticleLibraryListVO vo : list) {
+				
+				i++;
+				if(vo.getExamineStatus().equals(2) || vo.getExamineStatus().equals(3)){
+					if(i>1){
+						vo.setExamineStatus(4);
+					}
+				}
+				if(vo.getCover_type()!=null){
+					if(vo.getCover_type().equals(3)){
+						if(vo.getCover()!=null){
+							String[] split = vo.getCover().split(",");
+							for (String str : split) {
+								vo.setCover(str);
+								break;
+							}
+						}
+					}
+				}
+			}
+		}*/
 		return CallBack.success(articleService.page(form, pageParam));
 	}
 

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

@@ -32,6 +32,8 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,In
 	private ArticleLibraryMapper articleMapper;
 	@Autowired
 	private ResourceRelationMapper resourceRelationMapper;
+	@Autowired
+	private ResourceRelationService resourceRelationService;
 	
 	@Override
 	public BaseMapper<ArticleLibrary> getMapper() {
@@ -93,10 +95,18 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,In
 		if(list.size()>0){
 			int i=0;
 			for (ArticleLibraryListVO vo : list) {
-				i++;
-				if(vo.getExamineStatus().equals(2) || vo.getExamineStatus().equals(3)){
-					if(i>1){
-						vo.setExamineStatus(4);
+				resourceRelationService.createCriteria().andEqualTo("objectId", vo.getId());
+				List<ResourceRelation> list2 = resourceRelationService.selectByCriteria();
+				if(list2!=null){
+					if(list2.size()>1){
+						for (ResourceRelation resourceRelation : list2) {
+							i++;
+							if(resourceRelation.getExamineStatus().equals(2) || resourceRelation.getExamineStatus().equals(6) || resourceRelation.getExamineStatus().equals(0)){
+								if(i>1){
+									vo.setExamineStatus(4);
+								}
+							}
+						}
 					}
 				}
 				if(vo.getCover_type()!=null){