From b4cc23f323ee22aaa67640f1b055e096968fb4c0 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 13 Oct 2022 11:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/fuse/service/impl/TbFuseServiceImpl.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
index 68cc39a1..d7eac2bd 100644
--- a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java
@@ -226,9 +226,12 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
                 result.addAll(value.stream().map(attr -> {
                     TbFuseResourceDTO dto = new TbFuseResourceDTO();
                     BeanUtils.copyProperties(attr, dto);
-                    ResourceDTO resourceDTO = resourceService.get(dto.getResourceId());
-                    resourceDTO.setDeptName(sysDeptService.get(resourceDTO.getDeptId()).getName());
-                    dto.setResource(resourceDTO);
+                    if (org.apache.commons.lang3.StringUtils.isNumeric(dto.getResourceId())) {
+                        ResourceDTO resourceDTO = resourceService.get(Long.parseLong(dto.getResourceId()));
+                        resourceDTO.setDeptName(sysDeptService.get(resourceDTO.getDeptId()).getName());
+                        dto.setResource(resourceDTO);
+                    }
+
                     return dto;
                 }).collect(Collectors.toList()));
             } else if ("数据资源".equals(type)) {