1

src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -637,8 +637,10 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
                 for (SceneCooperation entity : list) {
                     User user = userMap.get(entity.getUserId());
                     cooMap.computeIfAbsent(entity.getSceneNum(), k -> new ArrayList<>());
-                    if(!cooMap.get(entity.getSceneNum()).contains(user)){
-                        cooMap.get(entity.getSceneNum()).add(user);
+                    if(user != null){
+                        if(!cooMap.get(entity.getSceneNum()).contains(user)){
+                            cooMap.get(entity.getSceneNum()).add(user);
+                        }
                     }
                 }
             }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -629,7 +629,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             for (SceneVo vo : sceneVoPage.getRecords()) {
                 if (StringUtils.isNotBlank(vo.getNum())) {
                     List<User> userVos = cooMap.get(vo.getNum());
-                    if (userVos != null) {
+                    if (userVos != null && !userVos.isEmpty()) {
                         List<Long> ids = userVos.stream().map(User::getId).collect(Collectors.toList());
                         List<String> userNameList = userVos.stream().map(User::getUserName).collect(Collectors.toList());
                         vo.setCooperationUserIdList(ids);