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 03369c0..4c9a758 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=""; + String code=""; SysUser sysUser=new SysUser(); switch (wwTyInfo.getUsertype()){ case "1": @@ -281,7 +281,7 @@ public class OauthLoginHlwService { appUserParm.setPhone(wwTyInfo.getPhone()); appUserParm.setIdCard(wwTyInfo.getIdno()); appUserParm.setName(wwTyInfo.getName()); - localUsername=StringUtil.USER_KEY+wwTyInfo.getIdno(); + code=wwTyInfo.getIdno(); break; default: sysUser.setNickName(wwTyInfo.getEnterprisename()); @@ -293,12 +293,13 @@ public class OauthLoginHlwService { appUserParm.setPhone(wwTyInfo.getPhone()); appUserParm.setIdCard(wwTyInfo.getEnterprisecode()); appUserParm.setName(wwTyInfo.getEnterprisename()); - localUsername=StringUtil.USER_KEY+wwTyInfo.getEnterprisecode(); + code=wwTyInfo.getEnterprisecode(); } + String localUsername=StringUtil.USER_KEY+code; //查询用户角色 sysUser.setUserName(localUsername); //查询用户id - SysUser parmUser=sysUserService.selectUserByUserName(localUsername); + SysUser parmUser=sysUserService.selectUserByIdCard(code); sysUser.setUserId(parmUser.getUserId()); sysUserService.updateUser(sysUser); //插入app_user diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 7372f66..20f8db7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1