From 3fdc508014c167ee5b1e4afca62fee7fb87b62e9 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 06 八月 2025 09:40:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 903563c..2f145e8 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -534,9 +534,15 @@
     @Override
     public Result updateMemberNickName(MemberNickNameForm form) {
         Member member = baseMapper.selectById(form.getMemberId());
-        member.setNickName(form.getNickName());
-        baseMapper.updateById(member);
-        return Result.ok("淇敼鎴愬姛");
+        boolean update = false;
+        if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isBlank(member.getNickName())) {
+            member.setNickName(form.getNickName());
+            update = true;
+        }
+        if (update){
+            baseMapper.updateById(member);
+        }
+        return Result.ok().data(member.getNickName());
     }
 
     @Override

--
Gitblit v1.8.0