fix: 【bug-94】客户端,代理申请子账号时,其中的语种,职位没有对应翻译;后台管理端职位、语种是有配对应语言的翻译的
当对应的语言没有配置时,取职位名称为语言值
This commit is contained in:
parent
3a697996f2
commit
bbb7d71fd4
|
|
@ -157,7 +157,7 @@ public class UserController extends ControllerBase {
|
|||
List<TitleVO> list = datas.stream().map(d -> {
|
||||
List<PositionLanguageVO> lvos = JSONUtil.toList(d.getPositionLanguage(), PositionLanguageVO.class);
|
||||
PositionLanguageVO lvo = lvos.stream().filter(l -> StrUtil.equals(l.getCode(), language)).findFirst().orElse(null);
|
||||
return new TitleVO().setId(d.getId()).setName(d.getName()).setValue(Objects.isNull(lvo) ? d.getName() : lvo.getLanguageValue());
|
||||
return new TitleVO().setId(d.getId()).setName(d.getName()).setValue(Objects.isNull(lvo) || StrUtil.isBlank(lvo.getLanguageValue()) ? d.getName() : lvo.getLanguageValue());
|
||||
}).collect(Collectors.toList());
|
||||
return ApiResult.success(list);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue