Merge branch 'dev'

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

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