From bb23e9b246b01fd5c342e3d8e3e14f4c76e1c5cd Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 27 Feb 2020 18:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=BB=BA=E6=88=90=E5=91=98=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtUserRoleMapper.xml            |  2 +-
 .../components/settings/OrganizationMember.vue       | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
index 87c3fc4cde..5418043cb4 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
@@ -46,7 +46,7 @@
     </select>
 
     <select id="getOrgMemberList" resultType="io.metersphere.base.domain.User">
-        SELECT `user`.* FROM user_role JOIN `user` ON user_role.user_id = `user`.id
+        SELECT distinct `user`.* FROM user_role JOIN `user` ON user_role.user_id = `user`.id
         WHERE user_role.source_id = #{orgMember.organizationId}
         <if test="orgMember.name != null">
             AND `user`.name like CONCAT('%', #{orgMember.name},'%')
diff --git a/frontend/src/performance/components/settings/OrganizationMember.vue b/frontend/src/performance/components/settings/OrganizationMember.vue
index 1ffcd111b2..95c765cd10 100644
--- a/frontend/src/performance/components/settings/OrganizationMember.vue
+++ b/frontend/src/performance/components/settings/OrganizationMember.vue
@@ -49,7 +49,7 @@
       </div>
     </el-card>
 
-    <el-dialog title="添加成员" :visible.sync="createVisible" width="30%">
+    <el-dialog title="添加成员" :visible.sync="createVisible" width="30%" :destroy-on-close="true" @close="closeFunc">
       <el-form :model="form" ref="form" :rules="rules" label-position="left" label-width="100px" size="small">
         <el-form-item label="成员" prop="userIds">
           <el-select v-model="form.userIds" multiple placeholder="请选择成员" class="select-width">
@@ -100,10 +100,10 @@
         tableData: [],
         rules: {
           userIds: [
-            {required: true, message: '请选择成员', trigger: ['blur', 'change']}
+            {required: true, message: '请选择成员', trigger: ['blur']}
           ],
           roleIds: [
-            {required: true, message: '请选择角色', trigger: ['blur', 'change']}
+            {required: true, message: '请选择角色', trigger: ['blur']}
           ]
         },
         multipleSelection: [],
@@ -141,6 +141,9 @@
       search() {
         this.initTableData();
       },
+      closeFunc() {
+        this.form = {};
+      },
       handleSizeChange(size) {
         this.pageSize = size;
         this.initTableData();
@@ -170,8 +173,9 @@
         });
       },
       create() {
+        this.form = {};
         this.result = this.$get('/user/list', response => {
-            this.createVisible = true;
+          this.createVisible = true;
           this.$set(this.form, "userList", response.data);
         });
         this.result = this.$get('/role/list/org', response => {