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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-12 14:58:56 +08:00
parent 3fc32a5a43 c45186367a
commit a6cadcb68f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -333,7 +333,7 @@ public class TAbilityApplicationController {
Map<String, List<TAbilityApplicationDTO>> finalResult1 = result; Map<String, List<TAbilityApplicationDTO>> finalResult1 = result;
Map<String, List<Map<String, Object>>> re = result.keySet().stream().map(index -> { Map<String, List<Map<String, Object>>> re = result.keySet().stream().map(index -> {
final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = finalResult1.get(index); final List<TAbilityApplicationDTO> tAbilityApplicationDTOList = finalResult1.get(index);
if (tAbilityApplicationDTOList.isEmpty()) { if (tAbilityApplicationDTOList == null || tAbilityApplicationDTOList.isEmpty()) {
return null; return null;
} }
List<ResourceDTO> resourceDTOS = tAbilityApplicationDTOList.stream().filter(tAbilityApplicationDTO -> StringUtils.isEmpty(tAbilityApplicationDTO.getCameraList())) // 过滤非摄像头申请 List<ResourceDTO> resourceDTOS = tAbilityApplicationDTOList.stream().filter(tAbilityApplicationDTO -> StringUtils.isEmpty(tAbilityApplicationDTO.getCameraList())) // 过滤非摄像头申请