From 82d6b98f5b6b88e223259547208ab59829ad723e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 01 十一月 2025 21:30:52 +0800
Subject: [PATCH] fix:增加旧系统状态同步到新系统,新系统状态同步到旧系统

---
 ruoyi-system/src/main/resources/mapper/system/HospDataMapper.xml |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/HospDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/HospDataMapper.xml
index c77b091..389c2fa 100644
--- a/ruoyi-system/src/main/resources/mapper/system/HospDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/HospDataMapper.xml
@@ -30,20 +30,27 @@
             HospIntroducerID, HospIntroducerDate, HospLevel
         FROM HospData
         WHERE 1=1
-        <!-- 鍦板煙杩囨护锛氬HospProvince, HospCity, HospArea杩涜OR鍖归厤 -->
-        <if test="region != null and region != ''">
-            AND (HopsProvince LIKE '%' + #{region} + '%' 
-                 OR HopsCity LIKE '%' + #{region} + '%'
-                 OR HopsArea LIKE '%' + #{region} + '%')
-        </if>
-        <!-- 鍏抽敭璇嶈繃婊わ細瀵瑰涓瓧娈佃繘琛孫R鍖归厤 -->
+        <!-- 鏈� keyword 灏卞彧鐢� keyword锛屼笉鐢� region -->
         <if test="keyword != null and keyword != ''">
-            AND (HopsProvince LIKE '%' + #{keyword} + '%'
-                 OR HopsCity LIKE '%' + #{keyword} + '%'
-                 OR HopsArea LIKE '%' + #{keyword} + '%'
-                 OR HospAddress LIKE '%' + #{keyword} + '%'
-                 OR HospName LIKE '%' + #{keyword} + '%'
-                 OR HospShort LIKE '%' + #{keyword} + '%')
+        AND (
+            HopsProvince LIKE '%' + #{keyword} + '%'
+                OR HopsCity LIKE '%' + #{keyword} + '%'
+                OR HopsArea LIKE '%' + #{keyword} + '%'
+                OR HospAddress LIKE '%' + #{keyword} + '%'
+                OR HospName LIKE '%' + #{keyword} + '%'
+                OR HospShort LIKE '%' + #{keyword} + '%'
+        )
+        </if>
+        <!-- 娌℃湁 keyword 鏃舵墠鐢� region -->
+        <if test="(keyword == null or keyword == '') and (region != null and region != '')">
+        AND (
+            HopsProvince LIKE '%' + #{region} + '%'
+                OR HopsCity LIKE '%' + #{region} + '%'
+                OR HopsArea LIKE '%' + #{region} + '%'
+                OR HospAddress LIKE '%' + #{region} + '%'
+                OR HospName LIKE '%' + #{region} + '%'
+                OR HospShort LIKE '%' + #{region} + '%'
+        )
         </if>
         AND (HospState IS NULL OR HospState = 1)
         ORDER BY HospName

--
Gitblit v1.9.1