diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index b8441a1..fee33f4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -407,7 +407,13 @@ public class CmsJobController extends BaseController } if(appReviewJob.getUserId()==null){ Long appuserId=RoleUtils.getSysAppuserId(); - AppUser appUser=appUserService.selectAppUserByUserId(appuserId); + AppUser appUser=null; + if(appuserId==null){ + String idCard= RoleUtils.getCurrentUseridCard(); + appUser=appUserService.selectAppuserByIdcard(idCard, StringUtil.IS_JOB_REQUEST_USER); + }else { + appUser=appUserService.selectAppUserByUserId(appuserId); + } if(appUser==null){ return AjaxResult.error("用户信息未完善,请完善身份证信息!"); }else{ 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 a351cc6..2a92b24 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 @@ -315,11 +315,6 @@ public class OauthLoginHlwService { } //查询用户角色 sysUser.setUserName(localUsername); - //查询用户id - SysUser parmUser=sysUserService.selectUserByIdCard(code); - sysUser.setUserId(parmUser.getUserId()); - sysUser.setPhonenumber(wwTyInfo.getPhone()); - sysUserService.updateUser(sysUser); //插入app_user AppUser appUser=appUserService.selectAppuserByIdcard(code,userType); if(appUser!=null){ @@ -328,6 +323,12 @@ public class OauthLoginHlwService { }else{ appUserService.insertAppUser(appUserParm); } + //查询用户id + SysUser parmUser=sysUserService.selectUserByIdCard(code); + sysUser.setUserId(parmUser.getUserId()); + sysUser.setPhonenumber(wwTyInfo.getPhone()); + sysUser.setAppUserId(appUserParm.getUserId()); + sysUserService.updateUser(sysUser); } /**