diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index bac5a11..f55f163 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -17,9 +17,7 @@ import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.cms.util.StringUtil; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.annotation.BussinessLog; -import com.ruoyi.common.core.domain.entity.AppSkill; -import com.ruoyi.common.core.domain.entity.AppUserShow; -import com.ruoyi.common.core.domain.entity.UserWorkExperiences; +import com.ruoyi.common.core.domain.entity.*; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -41,7 +39,6 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.cms.service.IAppUserService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; @@ -318,6 +315,17 @@ public class CmsAppUserController extends BaseController if(SecurityUtils.isLogin()){ userId=RoleUtils.getSysAppuserId(); } + if(userId==null){ + String idCard=RoleUtils.getCurrentUseridCard(); + AppUser appUser=appUserService.selectAppuserByIdcard(idCard,StringUtil.IS_JOB_REQUEST_USER); + if(appUser!=null){ + userId=appUser.getUserId(); + SysUser sysUser=new SysUser(); + sysUser.setAppUserId(userId); + sysUser.setUserId(SecurityUtils.getUserId()); + appUserService.updateSysUserById(sysUser); + } + } String templatePath="/data/downloadmodel/简历.docx"; AppUser result=appUserService.selectAppUserByUserId(userId); Map dataMap = new HashMap<>(); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java index dc49cdc..6023e35 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java @@ -60,4 +60,6 @@ public interface AppUserMapper extends BaseMapper Integer getIsJbdUser(@Param("idCard") String idCard); List selectUsersNotice(@Param("jobTitles") List jobTitles); + + void updateSysUserById(SysUser sysUser); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java index fd30949..8f9e656 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.AppUserShow; import com.ruoyi.common.core.domain.entity.MyChart; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.cms.domain.vo.AppUserLky; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.RegisterBody; /** @@ -101,4 +102,6 @@ public interface IAppUserService public AppUser getAppUserBase(String idCard); Integer getIsJbdUser(String idCard); + + public void updateSysUserById(SysUser sysUser); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index 78489a5..ae5356e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -1253,4 +1253,9 @@ public class AppUserServiceImpl extends ServiceImpl imple public Integer getIsJbdUser(String idCard) { return appUserMapper.getIsJbdUser(idCard); } + + @Override + public void updateSysUserById(SysUser sysUser){ + appUserMapper.updateSysUserById(sysUser); + } } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml index c3f3ca5..4e57893 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml @@ -348,4 +348,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update sys_user set app_user_id=#{appUserId} where user_id=#{userId} + + \ No newline at end of file