From 10929596a45512d8f1abb5c1e06be5ab27c7d30f Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Wed, 30 Apr 2025 10:34:26 +0800
Subject: [PATCH] deb

---
 .../organization/dto/DockerSearchQuery.java     |  5 +++--
 .../organization/OrganizationMemberMapper.java  |  3 ++-
 .../organization/OrganizationMemberService.java | 17 +----------------
 .../resources/xml/OrganizationMemberMapper.xml  | 16 ++++++++++------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java
index 3099f11..add886e 100644
--- a/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java
+++ b/src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java
@@ -4,7 +4,8 @@ import lombok.Data;
 
 @Data
 public class DockerSearchQuery {
-    private String name;
-    private Integer sectionId;
+    private String keyword;
     private Integer role;
+
+
 }
diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java
index dfac745..4a0d5c6 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/organization/OrganizationMemberMapper.java
@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.mapper.organization;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
+import com.syjiaer.clinic.server.entity.organization.dto.DockerSearchQuery;
 import com.syjiaer.clinic.server.entity.organization.vo.MemberVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -20,6 +21,6 @@ import java.util.List;
  */
 public interface OrganizationMemberMapper extends BaseMapper<OrganizationMember> {
 
-    List<MemberVo> selectDetailByIds(@Param("ids") List<Integer> ids);
+    List<MemberVo> selectDetailByQuery(DockerSearchQuery query);
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
index 6995359..ec85a3f 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
@@ -153,21 +153,6 @@ public class OrganizationMemberService extends BaseService {
         if (dockerSearchQuery == null){
             return new ArrayList<>();
         }
-        QueryWrapper<OrganizationMember> queryWrapper = new QueryWrapper<>();
-
-        queryWrapper.select("id");
-        if (dockerSearchQuery.getName() != null){
-            queryWrapper.like("name", dockerSearchQuery.getName());
-        }
-        if (dockerSearchQuery.getSectionId() != null){
-            queryWrapper.eq("section_id", dockerSearchQuery.getSectionId());
-        }
-        if (dockerSearchQuery.getRole() != null){
-            queryWrapper.eq("role", dockerSearchQuery.getRole());
-        }
-
-        List<Integer> ids = organizationMemberMapper.selectObjs(queryWrapper);
-
-        return organizationMemberMapper.selectDetailByIds(ids);
+        return organizationMemberMapper.selectDetailByQuery(dockerSearchQuery);
     }
 }
diff --git a/src/main/resources/xml/OrganizationMemberMapper.xml b/src/main/resources/xml/OrganizationMemberMapper.xml
index f1dbb52..c1a5e1d 100644
--- a/src/main/resources/xml/OrganizationMemberMapper.xml
+++ b/src/main/resources/xml/OrganizationMemberMapper.xml
@@ -2,13 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper">
 
-    <select id="selectDetailByIds" resultType="com.syjiaer.clinic.server.entity.organization.vo.MemberVo">
+    <select id="selectDetailByQuery" resultType="com.syjiaer.clinic.server.entity.organization.vo.MemberVo">
         SELECT om.*,os.name AS section_name
         FROM organization_member AS om LEFT JOIN organization_section AS os ON om.section_id = os.id
-        WHERE om.id IN
-        <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-
+        <where>
+            <if test="keyword != null and keyword != ''">
+                om.name LIKE concat('%', #{keyword}, '%')
+                or os.name LIKE concat('%', #{keyword}, '%')
+            </if>
+            <if test="role != null">
+                And om.role = #{role}
+            </if>
+        </where>
     </select>
 </mapper>