From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java
index 1817cf9..a5eafa9 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java
@@ -107,6 +107,7 @@
                     user = new User();
                     user.setUserNo(String.format(Constants.USER_NO_PRE, RandomUtil.randomNumbers(Constants.EIGHT)));
                     user.setState(Constants.ONE);
+                    user.setPhone(phoneNumber);
                     user.setProfilePicture(profilePicture);
                     user.setNickname(String.format(Constants.USER_NO_PRE, StringUtils.getCharAndNum(Constants.SIX)));
                     user.setState(Constants.ONE);
@@ -114,9 +115,13 @@
                     user.setIsDelete(Constants.ZERO);
                     this.save(user);
                 } else {
+                    if (user.getOpenId()!=null && !user.getOpenId().equals(openid)){
+                        user.setOpenId(openid);
+                        this.updateById(user);
+                    }
                     Integer state = user.getState();
                     if (state == 0) {
-                        throw new GlobalException("该账号未开启,无法进行登录!");
+                        throw new GlobalException("账号已被禁用,请联系平台管理员。");
                     }
                 }
                 // 校验通过,生成token及过期时间

--
Gitblit v1.7.1