From 31b53ed4e328090798dae35cecc9f5a60cdccd67 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 21 一月 2026 18:10:39 +0800
Subject: [PATCH] 修改人物搜索bug

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 1d27f36..5f15720 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -467,10 +467,21 @@
             .like(StringUtils.isNotEmpty(zfDoctor.getWmedical()), ZfDoctor::getWmedical, zfDoctor.getWmedical())
             .like(StringUtils.isNotEmpty(zfDoctor.getCmedical()), ZfDoctor::getCmedical, zfDoctor.getCmedical())
             .like(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
-        if (zfDoctor.getHasAttachment() != null && zfDoctor.getHasAttachment().equals("鏄�")) {
-            lqw.apply("url IS NOT NULL AND url != ''");
-        }//        lqw.like(StringUtils.isNotEmpty(zfDoctor.getCompanion()),ZfDoctor::getCompanion,zfDoctor.getCompanion());
 
+        if (StringUtils.isNotEmpty(zfDoctor.getIsHide())) {
+            lqw.and(wrapper -> wrapper
+                .ne(ZfDoctor::getIsHide, "鏄�")
+                .or()
+                .isNull(ZfDoctor::getIsHide)
+            );
+        }
+        if (zfDoctor.getHasAttachment() != null) {
+            if (zfDoctor.getHasAttachment().equals("鏄�")) {
+                lqw.apply("url IS NOT NULL AND url != ''");
+            }
+            else {
+                lqw.apply("(url IS NULL OR url = '')");
+            }        }
         if (CollectionUtils.isNotEmpty(zfDoctor.getCompanionList())) {
             List<String> companionList = zfDoctor.getCompanionList();
 
@@ -484,7 +495,7 @@
             if (!companionList.isEmpty()) {
                 // 纭繚鎵�鏈夊弬涓庝汉閮藉湪companion瀛楁涓�
                 for (String companion : companionList) {
-                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '锛�', ',')) > 0",
+                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(REPLACE(people, ' ', ''), '锛�', ','),';',',')) > 0",
                         companion);
                 }
             }
@@ -517,6 +528,7 @@
         zfDoctor.setCompanionList(list);        zfDoctor.setHappenStartTime(happenStartTime);
         zfDoctor.setHappenEndTime(happenEndTime);
         zfDoctor.setHasAttachment(hasAttachment);
+        zfDoctor.setIsHide("鍚�");
         return doctorList(zfDoctor);
     }
 

--
Gitblit v1.9.1