【数据资产】

1、查询附件信息和领域信息

@@ -612,6 +612,19 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         MfEnterprise mfEnterprise = enterpriseOptional.get();
         MfEnterprise mfEnterprise = enterpriseOptional.get();
         EnterpriseRSVO enterpriseRSVO = convertToVO(mfEnterprise);
         EnterpriseRSVO enterpriseRSVO = convertToVO(mfEnterprise);
 
 
+        // 查询附件信息
+        String guid = enterpriseRSVO.getGuid();
+        Map<String, List<EnterpriseAttachmentRSVO>> attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(guid));
+        if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(guid)) {
+            enterpriseRSVO.setAttachmentRSVOS(attachmentByEnterpriseGuids.get(guid));
+        }
+
+        // 查询领域信息
+        Map<String, List<EnterpriseDomainRSVO>> domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(guid));
+        if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(guid)) {
+            enterpriseRSVO.setDomainRSVOS(domainByEnterpriseGuids.get(guid));
+        }
+
         // 查询变更历史
         // 查询变更历史
         LambdaQueryWrapper<MfEnterpriseChangeApprove> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MfEnterpriseChangeApprove> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, mfEnterprise.getGuid());
         lambdaQueryWrapper.eq(MfEnterpriseChangeApprove::getSourceGuid, mfEnterprise.getGuid());
@@ -644,19 +657,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             }
             }
         }
         }
 
 
-        // 查询附件信息
-        String guid = enterpriseRSVO.getGuid();
-        Map<String, List<EnterpriseAttachmentRSVO>> attachmentByEnterpriseGuids = enterpriseAttachmentService.getMapByEnterpriseGuids(Collections.singletonList(guid));
-        if (ObjectUtils.isNotEmpty(attachmentByEnterpriseGuids) && attachmentByEnterpriseGuids.containsKey(guid)) {
-            enterpriseRSVO.setAttachmentRSVOS(attachmentByEnterpriseGuids.get(guid));
-        }
-
-        // 查询领域信息
-        Map<String, List<EnterpriseDomainRSVO>> domainByEnterpriseGuids = enterpriseDomainService.getMapByEnterpriseGuids(Collections.singletonList(guid));
-        if (ObjectUtils.isNotEmpty(domainByEnterpriseGuids) && domainByEnterpriseGuids.containsKey(guid)) {
-            enterpriseRSVO.setDomainRSVOS(domainByEnterpriseGuids.get(guid));
-        }
-
         return enterpriseRSVO;
         return enterpriseRSVO;
     }
     }