From 05db572c367badfa7ccd34223415aa14f4eefb9c Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 5 Jun 2025 10:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8=E5=BA=93=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/bonus/canteen/face/util/FaceServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java b/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java
index 694dfa9..2d1e790 100644
--- a/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java
+++ b/app/src/main/java/com/bonus/canteen/face/util/FaceServer.java
@@ -133,7 +133,7 @@ public class FaceServer {
                         UserInfo userInfo = AppDatabase.getDatabase(context).userDao().getUserInfoById(String.valueOf(bean.getUserId()));
                         String name = "";
                         if (userInfo != null) {
-                            name = userInfo.getNickName();
+                            name = userInfo.getNickName() != null ? userInfo.getNickName() : userInfo.getUserName();
                         }
                         faceRegisterInfoList.add(new FaceRegisterInfo(feature,name , bean.getUserId() + "",
                                 facePath));