fix20230109

apps/view_atlas/view.py

@@ -136,20 +136,14 @@ def find_up_thr1(industry_type, industry_id):
     res_one = [{"chain_name": chain_one_obj.industry_name,
                 "chain_name_id": chain_one_obj.id
                 } for chain_one_obj in chain_one_obj_list]
-    for it in res_one:  # 一级节点
-        pname_one = it
-        chain_name = pname_one["chain_name"]
+    for pname_one in res_one:  # 一级节点
+        chain_name1 = pname_one["chain_name"]
         total_count = 0
-
-        company_count = get_count(chain_name)
+        node_one = ''
+        # 一级的企业数量
+        company_count = get_count(chain_name1)
         total_count += company_count
-        # 一级
-        node_one = {
-            "node": "{}".format(chain_name),
-            "level": 2,
-            "company_count": total_count,
-            "subNodeList": []
-        }
+
         # 获取二级节点
         chain_two_obj_list = IndustryChain.query.filter_by(relate_id=pname_one["chain_name_id"]).all()
         res_two = [{"chain_name": chain_two_obj.industry_name,
@@ -158,13 +152,13 @@ def find_up_thr1(industry_type, industry_id):
 
         for item in res_two:
             pname_two = item
-            chain_name = pname_two["chain_name"]
-            company_count = get_count(chain_name)
+            chain_name2 = pname_two["chain_name"]
+            company_count = get_count(chain_name2)
             total_count += company_count
 
             # 二级
             node_two = {
-                "node": "{}".format(chain_name),
+                "node": "{}".format(chain_name2),
                 "level": 3,
                 "company_count": company_count,
                 "subNodeList": []
@@ -176,18 +170,25 @@ def find_up_thr1(industry_type, industry_id):
                           } for chain_three_obj in chain_three_obj_list]
             for itm in res_three:
                 pname_thr = itm
-                chain_name = pname_thr["chain_name"]
-                company_count = get_count(chain_name)
+                chain_name3 = pname_thr["chain_name"]
+                company_count = get_count(chain_name3)
                 total_count += company_count
 
                 # 三级
                 node_thr = {
-                    "node": "{}".format(chain_name),
+                    "node": "{}".format(chain_name3),
                     "level": 4,
                     "company_count": company_count,
                     "subNodeList": []
                 }
                 node_two["subNodeList"].append(node_thr)
+            # 一级
+            node_one = {
+                "node": "{}".format(chain_name1),
+                "level": 2,
+                "company_count": total_count,
+                "subNodeList": []
+            }
             node_one["subNodeList"].append(node_two)
         data["subNodeList"].append(node_one)
     return data