From ee9af47af6eff3e430a0e2558aff7e35b1b88995 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Fri, 21 Nov 2025 14:17:51 +0800
Subject: [PATCH] =?UTF-8?q?app=5Fuser=E6=B7=BB=E5=8A=A0=E6=88=B7=E7=B1=8D?=
 =?UTF-8?q?=E5=9C=B0=E5=92=8C=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/core/domain/entity/AppUser.java   | 6 ++++++
 .../ruoyi/framework/web/service/OauthLoginHlwService.java   | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
index f304668..4e6e532 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
@@ -153,4 +153,10 @@ public class AppUser extends BaseEntity
 
     @ApiModelProperty("一体机密码")
     private String ytjPassword;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("户籍地址")
+    private String domicileAddress;
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java
index cab44d2..03369c0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java
@@ -270,7 +270,7 @@ public class OauthLoginHlwService {
         AppUser appUserParm=new AppUser();
         appUserParm.setIsRecommend(1);
         //pc端
-        String localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno();
+        String localUsername="";
         SysUser sysUser=new SysUser();
         switch (wwTyInfo.getUsertype()){
             case "1":
@@ -281,6 +281,7 @@ public class OauthLoginHlwService {
                 appUserParm.setPhone(wwTyInfo.getPhone());
                 appUserParm.setIdCard(wwTyInfo.getIdno());
                 appUserParm.setName(wwTyInfo.getName());
+                localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno();
                 break;
             default:
                 sysUser.setNickName(wwTyInfo.getEnterprisename());
@@ -292,6 +293,7 @@ public class OauthLoginHlwService {
                 appUserParm.setPhone(wwTyInfo.getPhone());
                 appUserParm.setIdCard(wwTyInfo.getEnterprisecode());
                 appUserParm.setName(wwTyInfo.getEnterprisename());
+                localUsername=StringUtil.USER_KEY+wwTyInfo.getEnterprisecode();
         }
         //查询用户角色
         sysUser.setUserName(localUsername);