网络关系图人员显示问题

src/main/java/ieven/server/webapp/service/datastatic/DataStaticAnalysisTotal.java

@@ -47,6 +47,8 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         String newFileId = "";
         String newFileIdAll = "";
         String dateFileId = getFileId("数据分析-主体信息汇总明细", modelId, mongoTemplate);
+        String cft = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
+        String wld = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
         // 插入记录用户后续查询明细
         if (StringUtils.isNotBlank(dateFileId)) {
             MongoCursor<Document> cursor = getCursor(dateFileId, mongoTemplate);
@@ -69,19 +71,28 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             List<DataMap> needToSave = new ArrayList<>(1000);
             List<DataMap> needToSaveall = new ArrayList<>(1000);
             Map<String, Object> dataMapUser = new HashMap<>();
-            Map<String, String> dateFileId2Map = new HashMap<>();
             while (cursor.hasNext()) {
                 try {
                     origin = cursor.next();
                     String alipayId = origin.getString("交易主体账号");
                     DataMap dataMap;
+                    //组装用户基本信息
+                    String type = origin.getString("类型");
+                    String dateFileId2 = "";
+                    if ("财付通".equals(type)) {
+                        dateFileId2 = cft;
+
+                    } else if ("五联单".equals(type)) {
+                        dateFileId2 = wld;
+
+                    }
                     if (StringUtils.isNotBlank(alipayId) && !"null".equals(alipayId) && !alipayIds.contains(alipayId)) {
                         alipayIds.add(alipayId);
                         dataMap = new DataMap();
                         dataMap.put("fileId", newFileId);
                         dataMap.put("交易主体账号", alipayId);
                         dataMap.put("交易主体户名", "");
-                        getData(dataMap, origin);
+                        getData(dataMap, origin, dateFileId2);
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("交易主体户名");
@@ -95,42 +106,15 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                         }
                         namesSet.add(alipayUsername);
                     }
-                    //组装用户基本信息
-                    String type = origin.getString("类型");
-                    String dateFileId2 = "";
-                    if ("财付通".equals(type)) {
-                        String s = dateFileId2Map.get(type);
-                        if (PublicStatic.checkStr(s)) {
-                            s = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
-                            dateFileId2Map.put(type, s);
-                        }
-                        dateFileId2 = s;
-
-                    } else if ("反诈".equals(type)) {
-                        String s = dateFileId2Map.get(type);
-                        if (PublicStatic.checkStr(s)) {
-                            s = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
-                            dateFileId2Map.put(type, s);
-                        }
-                        dateFileId2 = s;
-
-                    } else if ("五联单".equals(type)) {
-                        String s = dateFileId2Map.get(type);
-                        if (PublicStatic.checkStr(s)) {
-                            s = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
-                            dateFileId2Map.put(type, s);
-                        }
-                        dateFileId2 = s;
-
-                    }
                     getDataAll(needToSaveall, origin, alipayIdsAll, newFileIdAll, dataMapUser, idToData, dateFileId2);
                     if (needToSaveall.size() >= 1000) {
                         List<DataMap> newDataList = new ArrayList<>();
                         for (DataMap map : needToSaveall) {
                             String zh = String.valueOf(map.get("账号"));
                             String zhmc = String.valueOf(map.get("账户名称"));
+                            String key = zh + "-" + zhmc;
                             if (StringUtils.isBlank(zhmc) || "null".equals(zhmc)) {
-                                String newZh = String.valueOf(dataMapUser.get(zh));
+                                String newZh = String.valueOf(dataMapUser.get(key));
                                 if (StringUtils.isBlank(newZh) || "null".equals(newZh)) {
                                     continue;
                                 } else {
@@ -177,8 +161,9 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 for (DataMap map : needToSaveall) {
                     String zh = String.valueOf(map.get("账号"));
                     String zhmc = String.valueOf(map.get("账户名称"));
+                    String key = zh + "-" + zhmc;
                     if (StringUtils.isBlank(zhmc) || "null".equals(zhmc)) {
-                        String newZh = String.valueOf(dataMapUser.get(zh));
+                        String newZh = String.valueOf(dataMapUser.get(key));
                         if (StringUtils.isBlank(newZh) || "null".equals(newZh)) {
                             continue;
                         } else {
@@ -199,7 +184,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         log.info("数据分析-主体信息汇总开始");
     }
 
-    public void getData(DataMap dataMap, Document origin) {
+    public void getData(DataMap dataMap, Document origin, String dateFileId2) {
         String type = origin.getString("类型");
         String account = origin.getString("交易主体账号");
         String zjha = "";
@@ -209,7 +194,6 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         String zcsj = "";
         if ("财付通".equals(type)) {
             //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
-            String dateFileId2 = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
             if (StringUtils.isNotBlank(dateFileId2)) {
                 List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
                         Criteria.where("modelId")
@@ -218,8 +202,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                                 .is(dateFileId2)
                                 .and("账号")
                                 .is(account)
-                                .and("generated")
-                                .is(Boolean.TRUE))), DataMap.class);
+                )), DataMap.class);
                 if (CollectionUtils.isNotEmpty(dataMaps)) {
                     zjha = String.valueOf(dataMaps.get(0).get("注册身份证号"));
                     bdyhkh = String.valueOf(dataMaps.get(0).get("银行账号"));
@@ -230,7 +213,6 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             }
         } else if ("五联单".equals(type)) {
 //       "用户ID", "登录邮箱", "登录手机", "账户名称", "证件类型", "证件号", "可用余额", "注册时间", "绑定手机", "绑定银行卡", "对应的协查数据"));
-            String dateFileId2 = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
             if (StringUtils.isNotBlank(dateFileId2)) {
                 List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
                         Criteria.where("modelId")
@@ -238,9 +220,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                                 .and("fileId")
                                 .is(dateFileId2)
                                 .and("用户ID")
-                                .is(account)
-                                .and("generated")
-                                .is(Boolean.TRUE))), DataMap.class);
+                                .is(account))), DataMap.class);
                 if (CollectionUtils.isNotEmpty(dataMaps)) {
                     zjha = String.valueOf(dataMaps.get(0).get("证件号"));
                     bdyhkh = String.valueOf(dataMaps.get(0).get("绑定银行卡"));
@@ -263,27 +243,31 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         String accounthm = String.valueOf(origin.getString("交易主体户名"));
         String accountds = String.valueOf(origin.getString("交易对手账号"));
         String accountdshm = String.valueOf(origin.getString("交易对手户名"));
-
-        List<String> accountList = new ArrayList<>();
+        if (accountdshm.equals("w12124268") || accountdshm.equals("w12124268")) {
+            System.out.println("555");
+        }
+        Set<String> accountList = new HashSet<>();
         Map<String, Object> dataMaphm = new HashMap<>();
         if (StringUtils.isNotBlank(account) && !"null".equals(account)) {
-            accountList.add(account);
-            dataMaphm.put(account, accounthm);
+            String key = account + "-" + accounthm;
+            accountList.add(key);
+            dataMaphm.put(key, accounthm);
             if (StringUtils.isNotBlank(account) && !"null".equals(account) && StringUtils.isNotBlank(accounthm) && !"null".equals(accounthm)) {
-                String s = String.valueOf(userMap.get(account));
+                String s = String.valueOf(userMap.get(key));
                 if (PublicStatic.checkStr(s)) {
-                    userMap.put(account, accounthm);
+                    userMap.put(key, accounthm);
                 }
             }
         }
 
         if (StringUtils.isNotBlank(accountds) && !"null".equals(accountds)) {
-            accountList.add(accountds);
-            dataMaphm.put(accountds, accountdshm);
+            String key1 = accountds + "-" + accountdshm;
+            accountList.add(key1);
+            dataMaphm.put(key1, accountdshm);
             if (StringUtils.isNotBlank(accountds) && !"null".equals(accountds) && StringUtils.isNotBlank(accountdshm) && !"null".equals(accountdshm)) {
-                String s = String.valueOf(userMap.get(accountds));
+                String s = String.valueOf(userMap.get(key1));
                 if (PublicStatic.checkStr(s)) {
-                    userMap.put(accountds, accountdshm);
+                    userMap.put(key1, accountdshm);
                 }
             }
         }
@@ -297,29 +281,50 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 for (String s : accountList) {
                     DataMap dataMap = havedUser.get(s);
                     if (dataMap != null) {
-                        dataMaps.add(dataMap);
+                        DataMap newDataMap = new DataMap();
+                        newDataMap.put("证件号", String.valueOf(dataMap.get("证件号码")));
+                        newDataMap.put("账户名称", String.valueOf(dataMap.get("交易主体户名")));
+                        newDataMap.put("账号", String.valueOf(dataMap.get("交易主体账号")));
+                        dataMaps.add(newDataMap);
                     } else {
                         if (StringUtils.isNotBlank(dateFileId2)) {
-                            dataMaps = this.mongoTemplate.find((new Query(
+                            List<DataMap> dataMapnew = this.mongoTemplate.find((new Query(
                                     Criteria.where("modelId")
                                             .is(modelId)
                                             .and("fileId")
                                             .is(dateFileId2)
                                             .and("账号")
                                             .in(s))), DataMap.class);
+
+                            if (CollectionUtils.isNotEmpty(dataMapnew)) {
+                                for (DataMap map : dataMapnew) {
+                                    DataMap newDataMap = new DataMap();
+                                    newDataMap.put("证件号", String.valueOf(map.get("注册身份证号")));
+                                    newDataMap.put("账户名称", String.valueOf(map.get("注册姓名")));
+                                    newDataMap.put("账号", String.valueOf(map.get("账号")));
+                                    dataMaps.add(newDataMap);
+                                }
+                            }
+                        } else {
+                            DataMap newDataMap = new DataMap();
+                            newDataMap.put("证件号", "");
+                            newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
+                            newDataMap.put("账号", s.split("-")[0]);
+                            dataMaps.add(newDataMap);
                         }
                     }
                 }
                 if (CollectionUtils.isNotEmpty(dataMaps)) {
                     for (DataMap dataMap : dataMaps) {
-                        if (!alipayIdsAll.contains(String.valueOf(dataMap.get("账号")))) {
+                        String key = String.valueOf(dataMap.get("账号") + "-"+String.valueOf(dataMap.get("账户名称")));
+                        if (!PublicStatic.checkStr(String.valueOf(dataMap.get("账号"))) && !alipayIdsAll.contains(key)) {
                             DataMap newDataMap = new DataMap();
                             newDataMap.put("fileId", newFileIdAll);
-                            newDataMap.put("证件号", String.valueOf(dataMap.get("注册身份证号")));
-                            newDataMap.put("账户名称", String.valueOf(dataMap.get("注册姓名")));
+                            newDataMap.put("证件号", String.valueOf(dataMap.get("证件号")));
+                            newDataMap.put("账户名称", String.valueOf(dataMap.get("账户名称")));
                             newDataMap.put("账号", String.valueOf(dataMap.get("账号")));
                             needToSaveall.add(newDataMap);
-                            alipayIdsAll.add(String.valueOf(dataMap.get("账号")));
+                            alipayIdsAll.add(key);
                         }
                     }
                 } else {
@@ -329,7 +334,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                             newDataMap.put("fileId", newFileIdAll);
                             newDataMap.put("证件号", "");
                             newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                            newDataMap.put("账号", s);
+                            newDataMap.put("账号", s.split("-")[0]);
                             needToSaveall.add(newDataMap);
                             alipayIdsAll.add(s);
                         }
@@ -338,7 +343,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             }
         } else if ("反诈".equals(type)) {
             for (String s : accountList) {
-                if (!alipayIdsAll.contains(s)) {
+                if (!PublicStatic.checkStr(s) && !alipayIdsAll.contains(s)) {
                     DataMap newDataMap = new DataMap();
                     newDataMap.put("fileId", newFileIdAll);
                     newDataMap.put("证件号", "");
@@ -356,28 +361,48 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 for (String s : accountList) {
                     DataMap dataMap = havedUser.get(s);
                     if (dataMap != null) {
-                        dataMaps.add(dataMap);
+                        DataMap newDataMap = new DataMap();
+                        newDataMap.put("证件号", String.valueOf(dataMap.get("证件号码")));
+                        newDataMap.put("账户名称", String.valueOf(dataMap.get("交易主体户名")));
+                        newDataMap.put("账号", String.valueOf(dataMap.get("交易主体账号")));
+                        dataMaps.add(newDataMap);
                     } else {
-
                         if (StringUtils.isNotBlank(dateFileId2)) {
-                            dataMaps = this.mongoTemplate.find((new Query(
+                            List<DataMap> dataMapnew = this.mongoTemplate.find((new Query(
                                     Criteria.where("modelId")
                                             .is(modelId)
                                             .and("fileId")
                                             .is(dateFileId2)
                                             .and("用户ID")
                                             .in(accountList))), DataMap.class);
+                            if (CollectionUtils.isNotEmpty(dataMapnew)) {
+                                for (DataMap map : dataMapnew) {
+                                    DataMap newDataMap = new DataMap();
+                                    newDataMap.put("证件号", String.valueOf(map.get("证件号")));
+                                    newDataMap.put("账户名称", String.valueOf(map.get("账户名称")));
+                                    newDataMap.put("账号", String.valueOf(map.get("用户ID")));
+                                    dataMaps.add(newDataMap);
+                                }
+                            }
+
+                        } else {
+                            DataMap newDataMap = new DataMap();
+                            newDataMap.put("fileId", newFileIdAll);
+                            newDataMap.put("证件号", "");
+                            newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
+                            newDataMap.put("账号", s);
+                            dataMaps.add(newDataMap);
                         }
                     }
                 }
                 if (CollectionUtils.isNotEmpty(dataMaps)) {
                     for (DataMap dataMap : dataMaps) {
-                        if (!alipayIdsAll.contains(String.valueOf(dataMap.get("用户ID")))) {
+                        if (!PublicStatic.checkStr(String.valueOf(dataMap.get("用户ID"))) && !alipayIdsAll.contains(String.valueOf(dataMap.get("用户ID")))) {
                             DataMap newDataMap = new DataMap();
                             newDataMap.put("fileId", newFileIdAll);
                             newDataMap.put("证件号", String.valueOf(dataMap.get("证件号")));
                             newDataMap.put("账户名称", String.valueOf(dataMap.get("账户名称")));
-                            newDataMap.put("账号", String.valueOf(dataMap.get("用户ID")));
+                            newDataMap.put("账号", String.valueOf(dataMap.get("账号")));
                             needToSaveall.add(newDataMap);
                             alipayIdsAll.add(String.valueOf(dataMap.get("用户ID")));
                         }

src/main/java/ieven/server/webapp/service/datastatic/DataStaticService.java

@@ -116,20 +116,25 @@ public class DataStaticService extends Ops {
         for (DataMap dataMap : dataMaps) {
             String zh = String.valueOf(dataMap.get("账号"));
             String zhmc = String.valueOf(dataMap.get("账户名称"));
-            List<DataMap> dataMaps1 = personMap.get(zh);
-            List<DataMap> dataMapshmc = personzhmcMap.get(zhmc);
+            String key1=zh+"-"+zhmc;
+            String key=zhmc+"-"+zh;
+            if (zh.equals("w12124268") || zhmc.equals("w12124268")) {
+                System.out.println("555");
+            }
+            List<DataMap> dataMaps1 = personMap.get(key1);
+            List<DataMap> dataMapshmc = personzhmcMap.get(key);
             if (CollectionUtils.isEmpty(dataMaps1)) {
-                personMap.put(zh, Lists.newArrayList(dataMap));
+                personMap.put(key1, Lists.newArrayList(dataMap));
             } else {
                 dataMaps1.add(dataMap);
-                personMap.put(zh, dataMaps1);
+                personMap.put(key1, dataMaps1);
             }
 
             if (CollectionUtils.isEmpty(dataMapshmc)) {
-                personzhmcMap.put(zhmc, Lists.newArrayList(dataMap));
+                personzhmcMap.put(key, Lists.newArrayList(dataMap));
             } else {
                 dataMapshmc.add(dataMap);
-                personzhmcMap.put(zhmc, dataMapshmc);
+                personzhmcMap.put(key, dataMapshmc);
             }
         }
 
@@ -171,25 +176,48 @@ public class DataStaticService extends Ops {
         //先去判断从是否有大于2的数据
 
         Map<String,List<DataMap>>dsMap=new HashMap<>();
+
+        Map<String,Set<String>>zh=new HashMap<>();
         for (DataMap map : dataMapDetail) {
             String jydszh = String.valueOf(map.get("交易对手账号"));
+            String jydshm = String.valueOf(map.get("交易对手户名"));
+            String jyds = String.valueOf(map.get("交易主体账号"));
+            String jyhm = String.valueOf(map.get("交易主体户名"));
+            if (jydszh.equals("w12124268") || jyds.equals("w12124268")) {
+                System.out.println("555");
+            }
             if (PublicStatic.checkStr(jydszh)) {
                 continue;
             }
-            List<DataMap> dataMaps1 = dsMap.get(jydszh);
+            String key=jydszh+"-"+jydshm;
+            List<DataMap> dataMaps1 = dsMap.get(key);
             if(CollectionUtils.isEmpty(dataMaps1)){
-                dsMap.put(jydszh,Lists.newArrayList(map));
+                dsMap.put(key,Lists.newArrayList(map));
             }else {
                 dataMaps1.add(map);
-                dsMap.put(jydszh,dataMaps1);
+                dsMap.put(key,dataMaps1);
+            }
+
+            //存储主体账号
+            Set<String> strings = zh.get(key);
+            if(CollectionUtils.isEmpty(strings)){
+                Set<String> objects = new HashSet<>();
+                objects.add(jyds);
+                zh.put(key,objects);
+            }else {
+                strings.add(jyds);
+                zh.put(key,strings);
             }
         }
         if(dsMap==null){
             return Mapped.ERROR("数据有误,请重新查询");
         }
         List<DataMap>newList=Lists.newArrayList();
-        for (Map.Entry<String,List<DataMap>> entry : dsMap.entrySet()) {
+        for (Map.Entry<String,Set<String>> entry : zh.entrySet()) {
            if(entry.getValue().size()>1){
+               if (entry.getKey().equals("w12124268") || entry.getKey().equals("w12124268")) {
+                   System.out.println("555");
+               }
                List<DataMap> dataMaps1 = dsMap.get(entry.getKey());
                newList.addAll(dataMaps1);
            }
@@ -200,7 +228,9 @@ public class DataStaticService extends Ops {
         List<String> userAllList = new ArrayList<>();
         for (DataMap map : newList) {
             String jythm = String.valueOf(map.get("交易主体户名"));
+            String jythmds = String.valueOf(map.get("交易对手户名"));
             String jydszh = String.valueOf(map.get("交易对手账号"));
+            String jyzh = String.valueOf(map.get("交易主体账号"));
             if (StringUtils.isBlank(jythm) || "null".equals(jythm)) {
                 continue;
             }
@@ -209,31 +239,36 @@ public class DataStaticService extends Ops {
                 continue;
             }
 
+            String key=jythm+"-"+jyzh;
+            String key1=jydszh+"-"+jythmds;
             //获取节点名称
-            if (!userList.contains(jythm)) {
+            List<DataMap> dataMapsparty1 = personzhmcMap.get(key);
+            List<DataMap> dataMapsparty2 = personMap.get(key1);
+            if(CollectionUtils.isEmpty(dataMapsparty1)||CollectionUtils.isEmpty(dataMapsparty2)){
+                continue;
+            }
+            if (!userList.contains(key)) {
                 Map<String, Object> userMap = new HashMap<>();
-                List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
-                if (CollectionUtils.isNotEmpty(dataMaps1)) {
-                    userMap.put("id", String.valueOf(dataMaps1.get(0).get("_id")));
-                    userMap.put("name", dataMaps1.get(0).get("账户名称"));
-                    userMap.put("relationPersons", dataMaps1);
+                if (CollectionUtils.isNotEmpty(dataMapsparty1)) {
+                    userMap.put("id", String.valueOf(dataMapsparty1.get(0).get("_id")));
+                    userMap.put("name", dataMapsparty1.get(0).get("账户名称"));
+                    userMap.put("relationPersons", dataMapsparty1);
                     userMap.put("type", "主");
                     partyDataList.add(userMap);
-                    userList.add(jythm);
+                    userList.add(key);
                 }
             }
 
-            if (!usermcList.contains(jydszh)) {
+            if (!usermcList.contains(key1)) {
                 Map<String, Object> userMap = new HashMap<>();
-                List<DataMap> dataMaps1 = personMap.get(jydszh);
-                if (CollectionUtils.isNotEmpty(dataMaps1)) {
-                    String cid = String.valueOf(dataMaps1.get(0).get("_id"));
+                if (CollectionUtils.isNotEmpty(dataMapsparty2)) {
+                    String cid = String.valueOf(dataMapsparty2.get(0).get("_id"));
                     userMap.put("id", cid);
-                    userMap.put("name", dataMaps1.get(0).get("账号"));
-                    userMap.put("relationPersons", dataMaps1);
+                    userMap.put("name", dataMapsparty2.get(0).get("账号"));
+                    userMap.put("relationPersons", dataMapsparty2);
                     userMap.put("type", "从");
                     partyDataList.add(userMap);
-                    usermcList.add(jydszh);
+                    usermcList.add(key1);
                 }
             }
             //增加线上数据
@@ -244,8 +279,8 @@ public class DataStaticService extends Ops {
 
             String userAllId = "";
             if (jdlx.equals("借")) {
-                List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
-                List<DataMap> dataMaps2 = personMap.get(jydszh);
+                List<DataMap> dataMaps1 = personzhmcMap.get(key);
+                List<DataMap> dataMaps2 = personMap.get(key1);
                 if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
                     String one = String.valueOf(dataMaps1.get(0).get("_id"));
                     party1.put("id", one);
@@ -257,9 +292,10 @@ public class DataStaticService extends Ops {
                     userAllId = one + "-" + two;
                 }
 
-            } else if (jdlx.equals("贷")) {
-                List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
-                List<DataMap> dataMaps2 = personMap.get(jydszh);
+            }
+            else if (jdlx.equals("贷")) {
+                List<DataMap> dataMaps1 = personzhmcMap.get(key);
+                List<DataMap> dataMaps2 = personMap.get(key1);
                 if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
                     String two = String.valueOf(dataMaps1.get(0).get("_id"));
                     party2.put("id", String.valueOf(dataMaps1.get(0).get("_id")));
@@ -299,9 +335,11 @@ public class DataStaticService extends Ops {
                 //total.put("relationships", dataDetailList);
                 relationshipGraphList.add(total);
                 userAllList.add(userAllId);
+                if (partyDataList.size() > 300) {
+                    return Mapped.ERROR("节点超过300个,请重新查询");
+                }
             }
         }
-
         for (Map<String, Object> stringObjectMap : relationshipGraphList) {
             Map<String, Object> party1 = (Map) stringObjectMap.get("party1");
             Map<String, Object> party2 = (Map) stringObjectMap.get("party2");
@@ -327,10 +365,6 @@ public class DataStaticService extends Ops {
         dataMap.put("partyData", partyDataList);
         dataMap.put("relationshipGraph", relationshipGraphListnew);
         Mapped mapped = Mapped.OK();
-        if (partyDataList.size() > 300) {
-            return Mapped.ERROR("节点超过300个,请重新查询");
-        }
-
         mapped.put("result", dataMap);
         return mapped;
     }