zkr/shz-dataDashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改返回期望薪资

Browse Source
This commit is contained in:
chenshaohua
2026-06-16 23:17:25 +08:00
parent 20e29544e6
commit 666c49aa11
6 changed files with 98 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
View File

@@ -239,6 +239,8 @@ public class SsoService {
throw new RuntimeException("获取用户证件信息失败");
}
personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
}else{
personCardNo=info.getString("entCreditCode");
}
}
@@ -255,7 +257,7 @@ public class SsoService {
//2.再查sysuser,不存在，则新增
SysUser sysUser = sysUserService.selectUserByIdCard(personCardNo);
if (sysUser == null) {
sysUser = saveSysUser(userJson, appUser.getUserId());
sysUser = saveSysUser(userJson, appUser.getUserId(),isCompanyUser);
}
//用户存在，生成本系统用户的token
@@ -341,7 +343,7 @@ public class SsoService {
}
if (sysUser == null) {
sysUser = saveSysUser(userJson, appUserId);
sysUser = saveSysUser(userJson, appUserId,isCompanyUser);
}
//用户存在，生成本系统用户的token
@@ -477,7 +479,7 @@ public class SsoService {
* @param userJson
* @return
*/
private SysUser saveSysUser(JSONObject userJson, Long appUserId) {
private SysUser saveSysUser(JSONObject userJson, Long appUserId,String isCompanyUser) {
JSONObject info = userJson.containsKey("info") ? userJson.getJSONObject("info") : null;
System.out.println("sysuserId==========" + userJson.getLong("userId"));
System.out.println("userJson==========" + JSONObject.toJSONString(userJson));
@@ -498,11 +500,15 @@ public class SsoService {
sysUser.setLoginIp(IpUtils.getIpAddr());
//获取身份证
String personCardNo = info != null && info.containsKey("personCardNo") ? info.getString("personCardNo") : userJson.getString("idCardNo");
String personCardNo="";
if("0".equals(isCompanyUser)){
personCardNo = info != null && info.containsKey("personCardNo") ? info.getString("personCardNo") : userJson.getString("idCardNo");
personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
}else{
personCardNo = info.getString("entCreditCode");
}
//解密处理
if (StringUtils.isNotEmpty(personCardNo)) {
personCardNo = EncryptUtil.decryptByAppIdAndSecret(personCardNo, webAppId, webAppSecret);
sysUser.setIdCard(personCardNo);
}
String phone = info != null && info.containsKey("personPhone") ? info.getString("personPhone") : userJson.getString("phonenumber");