From b6503809b15c0e714fbf407883d129e0c04d91fd Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 24 Feb 2021 19:29:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/base/mapper/ext/ExtSysUserMapper.xml   | 10 +++++++++-
 frontend/src/business/components/settings/sys/user.vue |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
index faca671d85..981982136c 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
@@ -15,8 +15,16 @@
 
     <resultMap id="BaseResultMap" type="io.dataease.controller.sys.response.SysUserGridResponse" extends="io.dataease.base.mapper.SysUserMapper.BaseResultMap">
         <result property="id" column="id"></result>
+        <association property="dept" javaType="io.dataease.controller.sys.response.SysUserDept">
+            <id column="dept_id" property="deptId"/>
+            <result column="pid" property="pid" />
+            <result column="dept_name" property="deptName" />
+        </association>
         <association property="dept" column="dept_id" javaType="io.dataease.controller.sys.response.SysUserDept" resultMap="sysUserDept"/>
-        <collection property="roles" column="role_id" javaType="io.dataease.controller.sys.response.SysUserRole" resultMap="sysUserRole" />
+        <collection property="roles" ofType="io.dataease.controller.sys.response.SysUserRole" >
+            <id column="role_id" property="roleId" />
+            <result column="role_name" property="roleName"/>
+        </collection>
     </resultMap>
 
     <select id="query" resultMap="BaseResultMap">
diff --git a/frontend/src/business/components/settings/sys/user.vue b/frontend/src/business/components/settings/sys/user.vue
index 02b130281c..36bc410d87 100644
--- a/frontend/src/business/components/settings/sys/user.vue
+++ b/frontend/src/business/components/settings/sys/user.vue
@@ -16,7 +16,7 @@
         <el-table-column :show-overflow-tooltip="true" width="135" prop="email" :label="$t('commons.email')" />
         <el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')">
             <template slot-scope="scope">
-                <div>{{ scope.row.dept.name }}</div>
+                <div>{{ scope.row.dept.deptName }}</div>
             </template>
         </el-table-column>
         <el-table-column prop="status" :label="$t('commons.status')" width="120">