From b309b0ce3923fe5c608bbc756184a54b5b801f8e Mon Sep 17 00:00:00 2001 From: sh Date: Mon, 25 May 2026 16:35:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=99=E5=8A=B3=E7=A7=91?= =?UTF-8?q?=E9=99=A2=E8=BF=94=E5=9B=9E=E7=9A=84=E6=8E=A5=E5=8F=A3=E4=B8=AD?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/cms/controller/cms/CmsAppUserController.java | 9 +++++++-- .../main/java/com/ruoyi/cms/domain/vo/AppUserLky.java | 3 +++ .../com/ruoyi/cms/service/impl/AppUserServiceImpl.java | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) 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; }