修改给劳科院返回的接口中返回人员名称
This commit is contained in:
@@ -213,9 +213,14 @@ public class CmsAppUserController extends BaseController
|
|||||||
if(StringUtils.isEmpty(RoleUtils.getCurrentUseridCard())){
|
if(StringUtils.isEmpty(RoleUtils.getCurrentUseridCard())){
|
||||||
return AjaxResult.error("用户信息为空!");
|
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)) {
|
if (Objects.isNull(appUser)) {
|
||||||
return AjaxResult.error("未查询到用户信息(身份证号:" + RoleUtils.getCurrentUseridCard() + ")!");
|
return AjaxResult.error("未查询到用户信息!");
|
||||||
}
|
}
|
||||||
AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser);
|
AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser);
|
||||||
return AjaxResult.success(appUserLky);
|
return AjaxResult.success(appUserLky);
|
||||||
|
|||||||
@@ -19,4 +19,7 @@ public class AppUserLky
|
|||||||
|
|
||||||
@ApiModelProperty("当前职位名称")
|
@ApiModelProperty("当前职位名称")
|
||||||
private List<String> jobTitles;
|
private List<String> jobTitles;
|
||||||
|
|
||||||
|
@ApiModelProperty("用户名称")
|
||||||
|
private String name;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -668,6 +668,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
|
|||||||
List<AppSkillVo> skillList=appSkillMapper.getUserSkillList(parmsk);
|
List<AppSkillVo> skillList=appSkillMapper.getUserSkillList(parmsk);
|
||||||
//回填
|
//回填
|
||||||
lky.setAppSkillsList(skillList);
|
lky.setAppSkillsList(skillList);
|
||||||
|
lky.setName(appUser.getName());
|
||||||
return lky;
|
return lky;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user