--no commit message

com.zrqx.fg.resource/src/main/java/com/zrqx/fg/resource/service/impl/ResourceServiceImpl.java

@@ -3,9 +3,11 @@ package com.zrqx.fg.resource.service.impl;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.beanutils.BeanUtils;
@@ -24,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.netflix.infix.lang.infix.antlr.EventFilterParser.null_predicate_return;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.resource.goods.GoodsTypeEnum;
 import com.zrqx.core.enums.resource.goods.GoodsTypeStartEnum;
@@ -381,12 +384,13 @@ public class ResourceServiceImpl extends BaseModelServiceImpl<PhyResource, Strin
 	public List<FgPhyResourceVo> listNew(Integer num1, Integer num2) {
 		List<FgPhyResourceVo> fgPhyResourceVos = listNewBase(num1, "1-1");
 		List<FgPhyResourceVo> fgPhyResourceVos1 = listNewBase(num1, "1-2");
-		fgPhyResourceVos.addAll(fgPhyResourceVos1);
-		fgPhyResourceVos.stream().sorted(Comparator.comparing(FgPhyResourceVo :: getPublishTime).reversed()).collect(Collectors.toList());
-		return fgPhyResourceVos;
+		List<FgPhyResourceVo> result = new ArrayList<FgPhyResourceVo>();
+		if(fgPhyResourceVos != null) result.addAll(fgPhyResourceVos); 
+		if(fgPhyResourceVos1 != null) result.addAll(fgPhyResourceVos1); 
+		result.stream().sorted(Comparator.comparing(FgPhyResourceVo :: getPublishTime).reversed()).collect(Collectors.toList());
+		return result;
 	}
 	
-
 	@Override
 	public List<FgResourceVo> batchGet(List<FgResourceForm> forms) {
 		List<FgResourceVo> fgResourceVos = forms.stream().map(form -> {