From 1421d52f3b6c7b7ab27203311f09c409abd581bf Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@supervision.ltd>
Date: Mon, 22 Jul 2024 13:25:53 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/db/enterprise_node/enterprise_node.py | 15 +++++++++------
 website/handlers/enterprise_device/handler.py |  6 +++---
 website/handlers/enterprise_entity/handler.py |  3 ++-
 website/handlers/enterprise_node/handler.py   |  2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/website/db/enterprise_node/enterprise_node.py b/website/db/enterprise_node/enterprise_node.py
index 6e84884..13417a7 100644
--- a/website/db/enterprise_node/enterprise_node.py
+++ b/website/db/enterprise_node/enterprise_node.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+import logging
 from typing import List, Dict, Any, Union
 
 from sqlalchemy import text
@@ -71,15 +71,18 @@ class EnterpriseNodeRepository(object):
                 n.id, n.name, n.parent, p.name AS parent_name, n.suid 
                 FROM enterprise_node n 
                 LEFT JOIN enterprise_node p ON n.parent = p.id 
-                WHERE n.entity_id=:entity_id AND n.del=0 and n.parent=0 
+                WHERE n.entity_id=:entity_id AND n.del=0  
                 """
             )
+            if name == "":
+                sql += " and n.parent=0"
+
             param = {"entity_id": entity_id}
 
             if name:
                 sql += " and n.name like :name"
                 param["name"] = f"%{name}%"
-
+            # logging.info(f"############################# sql: {sql}, param: {param}")
             res = session.execute(text(sql), param)
             node_list = to_json_list(res)
             node_list = node_list and node_list or []
@@ -115,9 +118,9 @@ class EnterpriseNodeRepository(object):
 
         param = {"parent": node["id"]}
 
-        if name:
-            sql += " and n.name like :name"
-            param["name"] = f"%{name}%"
+        # if name:
+        #     sql += " and n.name like :name"
+        #     param["name"] = f"%{name}%"
 
         res = session.execute(text(sql), param)
         node_list = to_json_list(res)
diff --git a/website/handlers/enterprise_device/handler.py b/website/handlers/enterprise_device/handler.py
index 4c3eb2f..827bc1f 100644
--- a/website/handlers/enterprise_device/handler.py
+++ b/website/handlers/enterprise_device/handler.py
@@ -287,7 +287,7 @@ class DeviceListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_list, "企业节点，设备列表")
+    @operation_log("企业管理", "设备管理", consts.op_type_list_str, "企业节点，设备列表")
     def post(self):
         node_id = self.get_int_argument("node_id")
         pageNo = self.get_int_argument("pageNo", 1)
@@ -337,7 +337,7 @@ class DeviceInfoHandler(APIHandler):
     ```
     """
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_list, "企业节点，设备信息")
+    @operation_log("企业管理", "设备管理", consts.op_type_list_str, "企业节点，设备信息")
     def post(self):
         device_id = self.get_int_argument("device_id")
         if not device_id:
@@ -382,7 +382,7 @@ class DeviceBasemodelListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list, "企业节点，节点信息 -> 设备列表 -> 基础模型配置 -> 模型列表")
+    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "企业节点，节点信息 -> 设备列表 -> 基础模型配置 -> 模型列表")
     def post(self):
         device_id = self.get_int_argument("device_id")
         if not device_id:
diff --git a/website/handlers/enterprise_entity/handler.py b/website/handlers/enterprise_entity/handler.py
index fc64e1f..47d87b7 100644
--- a/website/handlers/enterprise_entity/handler.py
+++ b/website/handlers/enterprise_entity/handler.py
@@ -298,7 +298,8 @@ class EntityInfoHandler(APIHandler):
             "province": row["province"],
             "city": row["city"],
             "addr": row["addr"],
-            "industry": consts.industry_map[row["industry"]],
+            "industry": row["industry"],
+            "industry_name": consts.industry_map[row["industry"]],
             "expire_at": "",
             "contact": row["contact"],
             "phone": row["phone"],
diff --git a/website/handlers/enterprise_node/handler.py b/website/handlers/enterprise_node/handler.py
index 069e42c..cdea5a7 100644
--- a/website/handlers/enterprise_node/handler.py
+++ b/website/handlers/enterprise_node/handler.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import json
+import logging
 
 from website import errors, consts
 from website.db.enterprise_busi_model import enterprise_busi_model as DB_BusiModel
@@ -157,6 +158,7 @@ class TreeHandler(APIHandler):
     def post(self):
         entity_id = self.get_escaped_argument("entity_id", "")
         name = self.get_escaped_argument("name", "")
+        # logging.info(f"name is {name}")
         if not entity_id:
             raise errors.HTTPAPIError(errors.ERROR_BAD_REQUEST, "参数错误")