From 4d9c7b8a6109c90f08c716fe3e19b6a990cc759a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?niohe=C2=B7erbao?= <anjszy@163.com>
Date: Mon, 26 Jun 2023 09:47:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=93=E5=AE=B6=E6=89=80=E5=A1=AB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java
index e531869..b7e6a73 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertAdminExpertManageAssembler.java
@@ -103,6 +103,9 @@ public class ExpertAdminExpertManageAssembler {
     }
 
     public List<DictionaryFieldInfo> assembleDictionaryName(List<DictionaryFieldInfo> collect) {
+        if (CollectionUtil.isEmpty(collect)){
+            return new ArrayList<>();
+        }
         return collect.stream().peek(r -> {
             DictionaryDTO dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode());
             if (Objects.nonNull(dictionaryDTO)) {
@@ -113,6 +116,9 @@ public class ExpertAdminExpertManageAssembler {
 
 
     public List<TagFieldInfo> assembleTagName(List<TagFieldInfo> collect) {
+        if (CollectionUtil.isEmpty(collect)){
+            return new ArrayList<>();
+        }
         return collect.stream().peek(r -> {
             TagDTO tagDTO = tagCache.getByTagCode(r.getTagCode());
             if (Objects.nonNull(tagDTO)) {