lyhzzz 2 年之前
父節點
當前提交
a81fa0783d
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

+ 6 - 3
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -422,10 +422,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         for (SceneVo record : sceneList.getRecords()) {
             record.setUserName(username);
             SceneCooperation sceneCooperationEntity = sceneCooperationService.getByNum(record.getNum());
-            if(sceneCooperationEntity != null){
-                record.setCooperationUserId(String.valueOf(sceneCooperationEntity.getUserId()));
+            if(sceneCooperationEntity != null && sceneCooperationEntity.getUserId()!= null){
+
                 User user1 = userService.getById(sceneCooperationEntity.getUserId());
-                record.setCooperationUserName(user1.getUserName());
+                if(user1 != null){
+                    record.setCooperationUserId(String.valueOf(sceneCooperationEntity.getUserId()));
+                    record.setCooperationUserName(user1.getUserName());
+                }
             }
         }
         return PageInfo.PageInfo(sceneList);