From 34a1f9b55c16a6d9a51e9d089e438ad49cdb7d83 Mon Sep 17 00:00:00 2001
From: tonquer <oyt96@qq.com>
Date: Sun, 27 Oct 2024 14:53:44 +0800
Subject: [PATCH] update

---
 .github/workflows/CI.yml | 6 ++----
 src/server/sql_server.py | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 63fd787..5b11553 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -17,10 +17,10 @@ jobs:
       PACKAGENAME: bika_py37_macos
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.7
+    - name: Set up Python 3.9
       uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -80,7 +80,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller==4.8
-        pip install pywin32==302
         pip install -r src\requirements.txt
     - name: Build
       run: |
@@ -117,7 +116,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller==4.6
-        pip install pywin32==302
         pip install -r src\requirements_win7.txt
     - name: Build
       run: |
diff --git a/src/server/sql_server.py b/src/server/sql_server.py
index 597308a..13730c9 100644
--- a/src/server/sql_server.py
+++ b/src/server/sql_server.py
@@ -527,9 +527,9 @@ def Search2(wordList, isTitle, isAuthor, isDes, isTag, isCategory, isCreator, ca
         data2 = ""
         for word in andWords:
             whereSql = SqlServer._GetSearchWhere(word, isTitle, isAuthor, isDes, isTag, isCategory, isCreator, True)
-            data2 += "{} or ".format(whereSql)
+            data2 += "{} and ".format(whereSql)
         if data2:
-            data += "and ({})".format(data2.strip("or "))
+            data += "and ({})".format(data2.strip("and "))
 
         data2 = ""
         for word in exclude: