From e54284843886ae47801daeef54856efcfb30e482 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 27 十月 2025 13:55:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 10a2f75..7a5df93 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -142,8 +142,13 @@
             sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
             sysAppUserService.save(sysAppUser);
         }else {
+            // 判断账号是否被冻结
+            if (sysAppUser.getStatus() == 2){
+                return R.fail("账号已冻结,请联系管理员");
+            }
             // 手机号相同但openId为空的情况
             sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
+            sysAppUserService.updateById(sysAppUser);
         }
         LoginUserApplet loginUserApplet = new LoginUserApplet();
         TSysUserResp sysUserResp = new TSysUserResp();

--
Gitblit v1.7.1