查询欢迎语，为空返回空集合

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WelcomeApiServiceImpl.java

@@ -8,9 +8,11 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
 import com.gic.haoban.manage.api.service.out.WelcomeApiService;
 import com.gic.haoban.manage.service.pojo.bo.welcome.*;
 import com.gic.haoban.manage.service.service.WelcomeService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,9 +69,16 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
             dto.setOperatorId(one.getOperatorId());
             dto.setOperatorName(one.getOperatorName());
             // 媒体列表
-            dto.setWelcomeMediaList(EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, one.getWelcomeMediaList()));
+            dto.setWelcomeMediaList(
+                    CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList()
+                            : EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, one.getWelcomeMediaList())
+            );
             // 适用部门列表
-            dto.setSuitDepartmentList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, one.getSuitDepartmentList()));
+
+            dto.setSuitDepartmentList(
+                    CollectionUtils.isEmpty(one.getSuitDepartmentList()) ? Collections.emptyList()
+                            : EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, one.getSuitDepartmentList())
+            );
             // 员工暂时不做
             return dto;
         }).collect(Collectors.toList());
@@ -87,9 +96,16 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         dto.setWelcomeContent(welcome.getWelcomeContent());
         dto.setOpenFlag(welcome.getOpenFlag());
         // 媒体列表
-        dto.setWelcomeMediaList(EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, welcome.getWelcomeMediaList()));
+        dto.setWelcomeMediaList(
+                CollectionUtils.isEmpty(welcome.getWelcomeMediaList()) ? Collections.emptyList()
+                        : EntityUtil.changeEntityListNew(WelcomeMediaDTO.class, welcome.getWelcomeMediaList())
+        );
         // 适用部门列表
-        dto.setSuitDepartmentList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, welcome.getSuitDepartmentList()));
+
+        dto.setSuitDepartmentList(
+                CollectionUtils.isEmpty(welcome.getSuitDepartmentList()) ? Collections.emptyList()
+                        : EntityUtil.changeEntityListNew(WelcomeSuitDepartmentDTO.class, welcome.getSuitDepartmentList())
+        );
         // 员工暂时不做
         return ServiceResponse.success(dto);
     }