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

Compare commits

base: wangliwen:5166ed440f9a2e47a8f652199e4c020774245bfc
Branches Tags
wangliwen:master
wangliwen:docker_package
wangliwen:dev
wangliwen:show
wangliwen:release
wangliwen:wangliwen
wangliwen:千万不要合并这个分支
wangliwen:缺陷修复版本
wangliwen:能力申请V3
wangliwen:v0.8.1.5.release(市局问题修复)
wangliwen:v0.8.1.4.release(市局问题修复)
wangliwen:v0.8.1.dev
wangliwen:v0.8.1.3.release（市局部署修复）
wangliwen:v0.8.1.2.release（西海岸部署修复）
wangliwen:v0.8.1.1.release(本地测试环境测试)
wangliwen:v0.8.0.1
wangliwen:v0.8.0
wangliwen:docker打包分支不要轻易合并本分支
..
compare: wangliwen:2a230b9c4008f112fdbfde8d8d5bb3c5d50ceb3b
Branches Tags
wangliwen:docker_package
wangliwen:master
wangliwen:dev
wangliwen:show
wangliwen:release
wangliwen:wangliwen
wangliwen:千万不要合并这个分支
wangliwen:缺陷修复版本
wangliwen:能力申请V3
wangliwen:v0.8.1.5.release(市局问题修复)
wangliwen:v0.8.1.4.release(市局问题修复)
wangliwen:v0.8.1.dev
wangliwen:v0.8.1.3.release（市局部署修复）
wangliwen:v0.8.1.2.release（西海岸部署修复）
wangliwen:v0.8.1.1.release(本地测试环境测试)
wangliwen:v0.8.0.1
wangliwen:v0.8.0
wangliwen:docker打包分支不要轻易合并本分支

No commits in common. "5166ed440f9a2e47a8f652199e4c020774245bfc" and "2a230b9c4008f112fdbfde8d8d5bb3c5d50ceb3b" have entirely different histories.
5166ed440f ... 2a230b9c40

1 changed files with 5 additions and 10 deletions
Show Stats Expand all files Collapse all files

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

@ -2871,9 +2871,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
List result = new ArrayList(); List result = new ArrayList();
if (!params.containsKey("type") || if (params.containsKey("type") && (null == params.get("type") || org.apache.commons.lang3.StringUtils.isBlank(params.get("type").toString()))) { //查所有
(params.containsKey("type") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("type") != null ? params.get("type").toString() : null))
) { //查所有
int total = 0; int total = 0;
List<Map> ucsApplyDtoList = resourceDao.selectCensusApplyTable(params); List<Map> ucsApplyDtoList = resourceDao.selectCensusApplyTable(params);
result.addAll(ucsApplyDtoList); result.addAll(ucsApplyDtoList);
@ -2891,8 +2890,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
}).reversed()) }).reversed())
.skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList()); .skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList());
return new PageData(newResult, total); return new PageData(newResult, total);
} else if (params.containsKey("type") && } else if ("云资源".equals(params.get("type").toString()) || "云视频".equals(params.get("type").toString())) {
("云资源".equals(params.get("type") != null ? params.get("type").toString() : null) || "云视频".equals(params.get("type") != null ? params.get("type").toString() : null))) {
List<Map> lcApplyDtoList = lcSelectCensusApplyTable(params); List<Map> lcApplyDtoList = lcSelectCensusApplyTable(params);
result.addAll(lcApplyDtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList())); result.addAll(lcApplyDtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList()));
return new PageData(result, lcApplyDtoList.size()); return new PageData(result, lcApplyDtoList.size());
@ -2913,9 +2911,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override @Override
public Object selectCensusApplyTableNotPaging(Map params) { public Object selectCensusApplyTableNotPaging(Map params) {
List<Map> resultList = new ArrayList<>(); List<Map> resultList = new ArrayList<>();
if (!params.containsKey("type") || if (params.containsKey("type") && (null == params.get("type") || org.apache.commons.lang3.StringUtils.isBlank(params.get("type").toString()))) { //查所有
(params.containsKey("type") && org.apache.commons.lang3.StringUtils.isNotEmpty(params.get("type") != null ? params.get("type").toString() : null))
) { // 查所有
resultList = resourceDao.selectCensusApplyTable(params); resultList = resourceDao.selectCensusApplyTable(params);
try { try {
List<Map> lcApplyDtoList = lcSelectCensusApplyTable(params); List<Map> lcApplyDtoList = lcSelectCensusApplyTable(params);
@ -2928,8 +2924,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
Map map = (Map) x; Map map = (Map) x;
return DateUtils.parse(map.get("createDate").toString(), DateUtils.DATE_TIME_PATTERN); return DateUtils.parse(map.get("createDate").toString(), DateUtils.DATE_TIME_PATTERN);
}).reversed()).collect(Collectors.toList()); }).reversed()).collect(Collectors.toList());
} else if (params.containsKey("type") && } else if ("云资源".equals(params.get("type").toString()) || "云视频".equals(params.get("type").toString())) { // 浪潮云资源
("云资源".equals(params.get("type") != null ? params.get("type").toString() : null) || "云视频".equals(params.get("type") != null ? params.get("type").toString() : null))) { // 浪潮云资源
try { try {
resultList = lcSelectCensusApplyTable(params); resultList = lcSelectCensusApplyTable(params);
resultList = resultList.stream() resultList = resultList.stream()