From bbb7d71fd40b1d0646b97f1f570fbe097c6dfff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 27 Apr 2025 09:10:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90bug-94=E3=80=91=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=EF=BC=8C=E4=BB=A3=E7=90=86=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AD=90=E8=B4=A6=E5=8F=B7=E6=97=B6=EF=BC=8C=E5=85=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E8=AF=AD=E7=A7=8D=EF=BC=8C=E8=81=8C=E4=BD=8D=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AF=B9=E5=BA=94=E7=BF=BB=E8=AF=91=EF=BC=9B=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E7=AB=AF=E8=81=8C=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E8=AF=AD=E7=A7=8D=E6=98=AF=E6=9C=89=E9=85=8D=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9A=84=E7=BF=BB=E8=AF=91=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当对应的语言没有配置时，取职位名称为语言值 --- .../com/nflg/mobilebroken/cfs/controller/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java index e0e14338..2f839ca2 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/UserController.java @@ -157,7 +157,7 @@ public class UserController extends ControllerBase { List list = datas.stream().map(d -> { List 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); }