Merge branch 'master' into docker_package

Merge branch 'dev'
npe
2023-01-12 14:58:56 +08:00 · 2023-01-12 14:58:49 +08:00 · 2023-01-12 14:58:43 +08:00
1 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/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())) // 过滤非摄像头申请
Author	SHA1	Message	Date
wangliwen	a6cadcb68f	Merge branch 'master' into docker_package	2023-01-12 14:58:56 +08:00
wangliwen	c45186367a	Merge branch 'dev'	2023-01-12 14:58:49 +08:00
wangliwen	0fe0f9b4a5	npe	2023-01-12 14:58:43 +08:00