From a01ecfc0fb40533bdc62160480dcd2e14ad20183 Mon Sep 17 00:00:00 2001
From: lizhicheng <lizhicheng2@hisense.com>
Date: Wed, 10 Aug 2022 19:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuse/service/impl/TbFuseServiceImpl.java     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 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 7f4f2c2e..76e82e2e 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
@@ -112,9 +112,8 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
         }
         params.put("userId", SecurityUser.getUserId());
         List<TbFuseDTO> dtoList = baseDao.getFuseDTOList(params);
-        Map<String, Map<String, Object>> dataResourceList=getDataResource();
         dtoList.forEach(dto -> {
-            dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId(), dataResourceList));
+            dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId()));
             dto.setFuseAttrList(getAttrByFuseId(dto.getId()));
         });
         List<TbFuseDTO> result = dtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList());
@@ -130,7 +129,7 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
         TbFuseDTO fuseDTO = new TbFuseDTO();
         BeanUtils.copyProperties(fuseEntity, fuseDTO);
         fuseDTO.setFuseAttrList(getAttrByFuseId(id));
-        fuseDTO.setFuseResourceList(getFuseResourceByFuseId(id, getDataResource()));
+        fuseDTO.setFuseResourceList(getFuseResourceByFuseId(id));
         setCollection(fuseDTO);
         return fuseDTO;
     }
@@ -175,17 +174,22 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
         return result;
     }
 
-    private List<TbFuseResourceDTO> getFuseResourceByFuseId(Long fuseId, Map<String, Map<String, Object>> dataResourceMap) {
+    private List<TbFuseResourceDTO> getFuseResourceByFuseId(Long fuseId) {
+        Map<String, Map<String, Object>> dataResourceMap = new HashMap<>();
         List<TbFuseResourceDTO> result = new ArrayList();
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("fuse_id", fuseId);
         List<TbFuseResourceEntity> list = fuseResourceDao.selectList(wrapper);
-        list.stream().filter(index -> index.getType() != null).collect(Collectors.groupingBy(TbFuseResourceEntity::getType)).forEach((type, value) -> {
+        Map<String, List<TbFuseResourceEntity>> resourceMap = list.stream().filter(index -> index.getType() != null).collect(Collectors.groupingBy(TbFuseResourceEntity::getType));
+        if (resourceMap.containsKey("数据资源")) {
+            dataResourceMap.putAll(getDataResource());
+        }
+        resourceMap.forEach((type, value) -> {
             if ("组件服务".equals(type)) {
                 result.addAll(value.stream().map(attr -> {
                     TbFuseResourceDTO dto = new TbFuseResourceDTO();
                     BeanUtils.copyProperties(attr, dto);
-                    ResourceDTO resourceDTO=resourceService.get(dto.getResourceId());
+                    ResourceDTO resourceDTO = resourceService.get(dto.getResourceId());
                     resourceDTO.setDeptName(sysDeptService.get(resourceDTO.getDeptId()).getName());
                     dto.setResource(resourceDTO);
                     return dto;