Merge branch 'fix_bug.0525'

rankin-product-service/src/main/java/cn/rankin/productservice/service/SupportService.java

@@ -138,6 +138,10 @@ public class SupportService {
             supportIdList.add(relation.getTid());
         });
 
+        if (supportIdList.isEmpty()){
+            return new ArrayList<>();
+        }
+
         List<Support> supportList = supportRepository.findByIds(supportIdList, BaseStatusEnum.NORMAL);
 
         return supportList;

rankin-resource-service/src/main/java/cn/rankin/resourceservice/service/ResourceService.java

@@ -8,15 +8,16 @@ import cn.rankin.common.utils.dto.resource.ResourceSearchDTO;
 import cn.rankin.common.utils.exception.DuplicateValueException;
 import cn.rankin.common.utils.exception.NotFoundException;
 import cn.rankin.common.utils.exception.UnsupportedOperationException;
+import cn.rankin.data.api.resource.entity.Resource;
 import cn.rankin.resourceservice.dto.ResourceDetail;
 import cn.rankin.resourceservice.dto.ResourceRemote;
-import cn.rankin.data.api.resource.entity.Resource;
 import cn.rankin.resourceservice.dto.ResourceVideo;
 import cn.rankin.resourceservice.proxy.RemoteResourceProxy;
 import cn.rankin.resourceservice.repository.ResourceRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -56,7 +57,7 @@ public class ResourceService {
             return APIResult.ok(page);
         }
 
-        List<Resource> resourceList = resourceRepository.find(resource, page.getStart(), pageSize, null);
+        List<Resource> resourceList = resourceRepository.find(resource, page.getStart(), pageSize, new Sort(Sort.Direction.DESC, "gmt_modified"));
         resourceList.forEach(r -> {
             initResourceUrl(r);
         });