From 4955cdc73d9beb5733aa2c0a578c14798394fa61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 23 九月 2025 18:06:45 +0800
Subject: [PATCH] AI对接

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 453956e..08215dd 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
@@ -131,16 +131,15 @@
                 .and(e->e.eq(TSysAppUser::getOpenId, appletUserDecodeData.getOpenId()).or()
                         .eq(TSysAppUser::getPhone, appletUserDecodeData.getPhoneNumber())));
         if (sysAppUser==null){
-//            appUser.setTenantAttributes();
-//            appUser.setTenantType();
             sysAppUser = new TSysAppUser();
             sysAppUser.setPhone(appletUserDecodeData.getPhoneNumber());
-//            sysAppUser.setAccount(appletUserDecodeData.getPhoneNumber());
-//            sysAppUser.setPassword(SecurityUtils.encryptPassword(appletUserDecodeData.getPhoneNumber().substring(5)));
             sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
             // 手机号中间四位替换为*
             sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
             sysAppUserService.save(sysAppUser);
+        }else {
+            // 手机号相同但openId为空的情况
+            sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
         }
         LoginUserApplet loginUserApplet = new LoginUserApplet();
         TSysUserResp sysUserResp = new TSysUserResp();

--
Gitblit v1.7.1