From b1928b49fb1b4efe481b4493e8cd03b88299f934 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Mon, 22 Dec 2025 16:09:05 +0800
Subject: [PATCH] 1

---
 app/common/controller/UserController.php | 2 +-
 app/common/service/UserService.php       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php
index cf31b71..335f816 100644
--- a/app/common/controller/UserController.php
+++ b/app/common/controller/UserController.php
@@ -171,7 +171,7 @@ class UserController extends BaseController
             $result = $this->service->miniappLogin($request->all());
             return $this->success($result);
         } catch (\Throwable $th) {
-            return $this->error($th->getMessage().$th->getLine().$th->getFile());
+            return $this->error($th->getMessage());
         }
     }
 
diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php
index a3ef501..06f5708 100644
--- a/app/common/service/UserService.php
+++ b/app/common/service/UserService.php
@@ -296,7 +296,9 @@ class UserService
         $old = UserOld::where('mobile', $mobile)->first();
         $uinfo = User::where('id', $request->user->uid)->first();
         if ($old) {
-            $uinfo->name = $old->name;
+            if(!empty($old->name)){
+                $uinfo->name = $old->name;
+            }
             $uinfo->is_release = 1;
         }
         $uinfo->mobile = $mobile;