修改参数判断

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

@@ -287,7 +287,7 @@ public class DimEntityServiceImpl implements DimEntityService {
         Map<String, Map> d0_all_data = new HashMap<>();
         Map<String, Map> d0_all_links = new HashMap<>();
         for (Map obj_v : data) {
-            String entityid = (String) obj_v.get("entityid");
+            String entityid = (String) obj_v.get("id");
             d0_all_data.put(entityid, obj_v);
         }
 
@@ -310,8 +310,8 @@ public class DimEntityServiceImpl implements DimEntityService {
                     String target = v0_keys[2];
                     Map sourceData = d0_all_data.get(source);
                     if (sourceData != null) {
-                        String entityid = (String) sourceData.get("entityid");
-                        String entityname = (String) sourceData.get("entityname");
+                        String entityid = (String) sourceData.get("id");
+                        String entityname = (String) sourceData.get("name");
                         if (entityid.contains(query_data) || entityname.contains(query_data)) {
                             retLinksList.add(d0_all_links.get(v0_key));
                             continue;
@@ -319,8 +319,8 @@ public class DimEntityServiceImpl implements DimEntityService {
                     }
                     Map targetData = d0_all_data.get(target);
                     if (targetData != null) {
-                        String entityid = (String) targetData.get("entityid");
-                        String entityname = (String) targetData.get("entityname");
+                        String entityid = (String) targetData.get("id");
+                        String entityname = (String) targetData.get("name");
                         if (entityid.contains(query_data) || entityname.contains(query_data)) {
                             retLinksList.add(d0_all_links.get(v0_key));
                         }
@@ -337,8 +337,8 @@ public class DimEntityServiceImpl implements DimEntityService {
         } else if (StringUtils.isNotEmpty(query_data)) {
             Set<String> d1_all_data = new HashSet<>();
             for (Map sourceData : data) {
-                String entityid = (String) sourceData.get("entityid");
-                String entityname = (String) sourceData.get("entityname");
+                String entityid = (String) sourceData.get("id");
+                String entityname = (String) sourceData.get("name");
                 if (entityid.contains(query_data) || entityname.contains(query_data)) {
                     d1_all_data.add(entityid);
                 }