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 0c79aca..525d9f3 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 @@ -213,9 +213,14 @@ public class CmsAppUserController extends BaseController if(StringUtils.isEmpty(RoleUtils.getCurrentUseridCard())){ return AjaxResult.error("用户信息为空!"); } - appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + Long userId=RoleUtils.getSysAppuserId(); + if(userId==null){ + appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + }else{ + appUser=appUserService.selectAppUserByUserId(userId); + } if (Objects.isNull(appUser)) { - return AjaxResult.error("未查询到用户信息(身份证号:" + RoleUtils.getCurrentUseridCard() + ")!"); + return AjaxResult.error("未查询到用户信息!"); } AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser); return AjaxResult.success(appUserLky); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java index 207064b..9ed2512 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/AppUserLky.java @@ -19,4 +19,7 @@ public class AppUserLky @ApiModelProperty("当前职位名称") private List jobTitles; + + @ApiModelProperty("用户名称") + private String name; } 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 98ba532..935a802 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 @@ -668,6 +668,7 @@ public class AppUserServiceImpl extends ServiceImpl imple List skillList=appSkillMapper.getUserSkillList(parmsk); //回填 lky.setAppSkillsList(skillList); + lky.setName(appUser.getName()); return lky; }