lsd/ks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/appLogin返回参数添加角色和idcard

Browse Source
This commit is contained in:
sh
2025-10-21 16:56:19 +08:00
parent 070239d1d5
commit a6d43c0bca
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@@ -259,7 +259,8 @@ public class SysLoginService
String token = loginUserIdApp(existingUser);
ajax.put(Constants.TOKEN, token);
ajax.put("isNewUser", false);
ajax.put("idCard", existingUser.getIdCard());
ajax.put("idCard",existingUser.getIdCard());
ajax.put("isCompanyUser",existingUser.getIsCompanyUser());
return ajax;
}else {
JSONObject phoneInfo = wechatUtil.decryptPhoneNumber(dto.getEncryptedData(), sessionKey, dto.getIv());
@@ -270,22 +271,29 @@ public class SysLoginService
// 3. 检查手机号是否已被绑定
AppUser existUser = appUserService.getPhone(phone);
String token="";
boolean isNewUser=false;
if (existUser != null) {
return AjaxResult.error("该手机号已注册");
existUser.setOpenid(openid);
appUserService.updateAppUser(existUser);
// 5. 生成系统令牌
token = loginUserIdApp(existUser);
ajax.put("idCard",existUser.getIdCard());
ajax.put("isCompanyUser",existUser.getIsCompanyUser());
}else{
// 4. 创建用户并存储所有信息
AppUser appUser = new AppUser();
appUser.setOpenid(openid);
appUser.setUnionid(unionid);
appUser.setPhone(phone);
appUser.setIsCompanyUser(dto.getUserType());//保存角色
appUserService.insertAppUser(appUser);
// 5. 生成系统令牌
token = loginUserIdApp(appUser);
isNewUser=true;
}
// 4. 创建用户并存储所有信息
AppUser appUser = new AppUser();
appUser.setOpenid(openid);
appUser.setUnionid(unionid);
appUser.setPhone(phone);
appUser.setIsCompanyUser(dto.getUserType());//保存角色
appUserService.insertAppUser(appUser);
// 5. 生成系统令牌
String token = loginUserIdApp(appUser);
ajax.put("isNewUser", isNewUser);
ajax.put(Constants.TOKEN, token);
ajax.put("isNewUser", true);
return ajax;
}
}