From 6f704459c63d59168aed1f418e8a1a100c06cda5 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 23 Jun 2021 18:06:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=94=A8=E6=88=B7=E7=BB=84=E5=92=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90):=20=E7=94=A8=E6=88=B7=E7=BB=84=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml     | 3 +++
 .../business/components/settings/system/group/UserGroup.vue    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml
index e19262b6fe..1a16905c06 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml
@@ -33,6 +33,9 @@
                 </if>
             </where>
         ) temp
+        <if test="request.name != null and request.name!=''">
+            where temp.name like CONCAT('%', #{request.name},'%')
+        </if>
         <if test="request.orders != null and request.orders.size() > 0">
             order by
             <foreach collection="request.orders" separator="," item="order">
diff --git a/frontend/src/business/components/settings/system/group/UserGroup.vue b/frontend/src/business/components/settings/system/group/UserGroup.vue
index 908b9a4617..4dffc6c3f1 100644
--- a/frontend/src/business/components/settings/system/group/UserGroup.vue
+++ b/frontend/src/business/components/settings/system/group/UserGroup.vue
@@ -3,7 +3,7 @@
     <el-card>
       <template v-slot:header>
         <ms-table-header :create-permission="['SYSTEM_GROUP:READ+CREATE','ORGANIZATION_GROUP:READ+CREATE']" :condition.sync="condition" @search="initData" @create="create"
-                         :create-tip="$t('group.create')" :title="$t('group.group_permission')" :have-search="false"/>
+                         :create-tip="$t('group.create')" :title="$t('group.group_permission')"/>
       </template>
 
       <el-table :data="groups" border class="adjust-table" style="width: 100%"