From 7bd9f429c2827d1a136cca992ba9b73aaf33d900 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 21 Jul 2020 13:52:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E8=83=BD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?LDAP=E6=9D=A5=E6=BA=90=E7=94=A8=E6=88=B7=E7=9A=84=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml | 2 +-
 frontend/src/business/components/settings/system/User.vue      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
index 97c9279589..ef7a81a3fe 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="getUserList" resultMap="BaseResultMap">
-        select u.id, u.name, u.email, u.phone, u.language, u.status,
+        select u.id, u.name, u.email, u.phone, u.language, u.status, u.source,
                u.last_organization_id, u.last_workspace_id, u.language, u.create_time, u.update_time
           from `user` u
         <where>
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 07adf4f49a..165f1e9339 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -37,7 +37,7 @@
             <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)">
               <template v-slot:behind>
                 <ms-table-operator-button :tip="$t('member.edit_password')" icon="el-icon-s-tools"
-                                          type="success" @exec="editPassword(scope.row)"/>
+                                          type="success" @exec="editPassword(scope.row)" v-if="!scope.row.isLdapUser"/>
               </template>
             </ms-table-operator>
           </template>
@@ -488,6 +488,7 @@
               let roles = data.roles;
               // let userRoles = result.userRoles;
               this.$set(this.tableData[i], "roles", roles);
+              this.$set(this.tableData[i], "isLdapUser", this.tableData[i].source === 'LDAP' ? true : false);
             });
           }
         })