diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
index 21a02ea4..6e3226f4 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
@@ -61,6 +61,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
             return BaseResult.getFailureMessageEntity("主数据编码为空");
         }
         ComparisonEntity comparisonEntity = jsonObject.toJavaObject(ComparisonEntity.class);
+        ComparisonDetailsEntity comparisonDetailsEntity=new ComparisonDetailsEntity();
         List<ComparisonEntity> comparisonEntities=new ArrayList<>();
         try {
             //根据主数据编码查询表名称，字段名称等信息 10001
@@ -85,12 +86,27 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
                             map.remove("appCode");
                         }
                     }
+                    if (entity.getDbType().equals("2")) {
+                        comparisonDetailsEntity.setDbName(entity.getDbName());
+                    }
                 }
             }
             comparisonEntity.setMap(map);
             try {
                 List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
-                PageInfo pageInfo = new PageInfo(comparisonEntitiePages);
+                JSONArray jsonArray=new JSONArray();
+                if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
+                    for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) {
+                        comparisonDetailsEntity.setFormmainId(String.valueOf(comparisonEntitiePage.get("id")));
+                        List<Map<String, Object>> maps = comparisonDetailsDao.queryComparisonDetailsPage(comparisonDetailsEntity);
+                        jsonArray.add(maps);
+                    }
+                }
+                JSONObject jsonObjects=new JSONObject();
+                jsonObjects.put("main",comparisonEntitiePages);
+                jsonObjects.put("details",jsonArray);
+                List<JSONObject> jsonObjects1 = JSON.parseArray(jsonObjects.toJSONString(), JSONObject.class);
+                PageInfo pageInfo = new PageInfo(jsonObjects1);
                 return BaseResult.getSuccessMessageEntity("查询成功", pageInfo);
             } catch (Exception e) {
                 logger.info("查询通用数据错误:{}", e.getMessage());