From 675c59ceb5a0cd119ff1ca39f126200703635d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A3=AE?= <pengsen@fecr.com.cn>
Date: Fri, 14 Jan 2022 15:37:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20search=E6=8E=A5=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 company/db.py      | 15 ++++++++++-----
 company/scripts.py |  2 ++
 rating/db.py       | 17 +++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/company/db.py b/company/db.py
index 491cb6f..bc2bd57 100644
--- a/company/db.py
+++ b/company/db.py
@@ -16,12 +16,17 @@ def find_company_records(query, skip, limit):
         record: 查询结果
     """
     collection = client['用户']['用户信息']
-    data = collection.find({"企业ID": query}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
-    record = list(data)
-    if len(record) == 0:
-        data = collection.find({"企业名称": re.compile(query)}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
+    if query:
+        data = collection.find({"企业ID": query}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
         record = list(data)
-    return record
+        if len(record) == 0:
+            data = collection.find({"企业名称": re.compile(query)}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
+            record = list(data)
+        return record
+    else:
+        data = collection.find({}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
+        record = list(data)
+        return record
 
 
 def find_user_info(cid):
diff --git a/company/scripts.py b/company/scripts.py
index 82ad4aa..6164327 100644
--- a/company/scripts.py
+++ b/company/scripts.py
@@ -6,6 +6,8 @@ def search_company_script(query, skip, limit):
     查询企业信息
     Parameters:
         query: 查询条件（企业名称/企业id）
+        skip: 默认0
+        limit: 每页显示条数
     Returns:
         result: 返回数据
     """
diff --git a/rating/db.py b/rating/db.py
index ac3f642..e05dfda 100644
--- a/rating/db.py
+++ b/rating/db.py
@@ -18,15 +18,20 @@ def find_rating_records(query, skip, limit):
         record: 查询结果
     """
     collection = client['评价']['评价记录']
-    data = collection.find({"企业ID": query}, {'_id': False}).skip(skip).limit(limit)
-    record = list(data)
-    if len(record) == 0:
-        data = collection.find({"评价ID": query}, {'_id': False}).skip(skip).limit(limit)
+    if query:
+        data = collection.find({"企业ID": query}, {'_id': False}).skip(skip).limit(limit)
         record = list(data)
         if len(record) == 0:
-            data = collection.find({"评价时间": re.compile(query)}, {'_id': False}).skip(skip).limit(limit)
+            data = collection.find({"评价ID": query}, {'_id': False}).skip(skip).limit(limit)
             record = list(data)
-    return record
+            if len(record) == 0:
+                data = collection.find({"评价时间": re.compile(query)}, {'_id': False}).skip(skip).limit(limit)
+                record = list(data)
+        return record
+    else:
+        data = collection.find({}, {'_id': False}).skip(skip).limit(limit)
+        record = list(data)
+        return record
 
 
 def find_rating_result_records(rid):