处理消息回显姓名错误

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CbsUserServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class CbsUserServiceImpl implements CbsUserService {
@@ -34,7 +35,7 @@ public class CbsUserServiceImpl implements CbsUserService {
                 CbsUserWrapper.User user = new CbsUserWrapper.User();
                 user.setId(simpleUserDto.getUserId().longValue());
                 user.setUsername(query.getClientType() == null || query.getClientType() == EClientType.STUDENT ?
-                        simpleUserDto.getNickName() : simpleUserDto.getUserName());
+                        simpleUserDto.getNickName() : Optional.ofNullable(simpleUserDto.getUserName()).orElse(simpleUserDto.getNickName()));
                 user.setPhone(simpleUserDto.getPhone());
                 result.add(user);
             }