From 0a17c26e84659af4a7479a8e0022cbd2c759b43c Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 31 Jul 2024 10:12:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BF=BB=E8=AF=91=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E4=B8=8D=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=9F=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/aspect/TranslationAspect.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java index d2fd8ed5..e98b9f47 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java @@ -258,10 +258,13 @@ public class TranslationAspect { if (k.trim().length() == 0) { continue; //跳过循环 } - if (!StringUtils.isEmpty(table)) { + if (!StringUtils.isEmpty(table) && StrUtil.isNotBlank(text)) { tmpValue = commonAPI.queryTableDictTextByKey(table, text, code, k.trim()); } else { - List listNew = listDict.stream().filter(o -> Objects.equals(o.getDictCode(), code) && Objects.equals(o.getItemValue(), k.trim())).collect(Collectors.toList()); + List listNew = listDict.stream() + .filter(o -> Objects.equals(o.getDictCode(), code) && + Objects.equals(o.getItemValue(), k.trim())) + .collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listNew)) { tmpValue = listNew.get(0).getItemText(); }