wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
wangliwen 2022-07-22 15:45:34 +08:00
parent aa54a9a8fc 81b5b28743
commit 6c06060b16
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -308,7 +308,7 @@ public class CensusController {
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}).reversed().thenComparing(i -> i.toString()) }).reversed().thenComparing(Object::toString)
); // 按应用领域数目逆序排序 ); // 按应用领域数目逆序排序
return new Result<List<Map<String, Object>>>().ok(result); return new Result<List<Map<String, Object>>>().ok(result);
} }

2
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -1077,7 +1077,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
return resourceList; return resourceList;
} else if ("数据资源".equals(type)) { } else if ("数据资源".equals(type)) {
GetDataResourceListDto dto = new GetDataResourceListDto(); GetDataResourceListDto dto = new GetDataResourceListDto();
dto.setPageNum(0); dto.setPageNum(1);
dto.setPageSize(30); dto.setPageSize(30);
Optional<AbstractDataResourceService> factory = DataResourceFactory.build(); Optional<AbstractDataResourceService> factory = DataResourceFactory.build();
if (factory.isPresent()) { if (factory.isPresent()) {