关系节点返回字段更改

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/dimentity/impl/DimEntityServiceImpl.java

@@ -160,10 +160,12 @@ public class DimEntityServiceImpl implements DimEntityService {
     public Map<String, Object> queryEntityRelationshipToNeo4j(String entityid) {
         Map<String, Object> retMap = new HashMap<>();
 //        String sql = "match (n:Entity{ entityid:'MA1001NE103K1034230XXXXXXXXXXXXX2501010009'}) <-[r]->(b:Entity)  return b.entityid, type(r)";
-        String sql = "match (n:Entity{ entityid:'" + entityid + "'}) <-[r]->(b:Entity)  " + "return n.entityid as entityid,  n.entilayer as entilayer, " + " b.entityid as comentityid,  b.entilayer as comilayer,  " + "type(r) as comrelation";
+        String sql = "match (n:Entity{ entityid:'" + entityid + "'}) <-[r]->(b:Entity)  " + "return n.entityid as source,  n.entilayer as entilayer, " + " b.entityid as target,  b.entilayer as comilayer,  " + "type(r) as comrelation";
         System.out.println("cql:" + sql);
         Collection<Map<String, Object>> links = neo4jClient.query(sql).fetch().all();
         if (links.isEmpty()) {
+            retMap.put("links", new HashMap<>());
+            retMap.put("data", new ArrayList<>());
             return retMap;
         }
         retMap.put("links", links);
@@ -171,7 +173,7 @@ public class DimEntityServiceImpl implements DimEntityService {
         List<Map<String, Object>> dataList = new ArrayList<>();
         Set<String> dataSet = new HashSet<>();
         for (Map<String, Object> doMap : links) {
-            String comentityid = (String) doMap.get("comentityid");
+            String comentityid = (String) doMap.get("target");
             if (!dataSet.contains(comentityid)) {
                 dataList.add(queryEntityData(comentityid));
                 dataSet.add(comentityid);