github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: 用户列表

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-02-24 19:29:17 +08:00
parent 2934e3cbc0
commit b6503809b1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml
View File

@ -15,8 +15,16 @@
<resultMap id="BaseResultMap" type="io.dataease.controller.sys.response.SysUserGridResponse" extends="io.dataease.base.mapper.SysUserMapper.BaseResultMap"> <resultMap id="BaseResultMap" type="io.dataease.controller.sys.response.SysUserGridResponse" extends="io.dataease.base.mapper.SysUserMapper.BaseResultMap">
<result property="id" column="id"></result> <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"/> <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> </resultMap>
<select id="query" resultMap="BaseResultMap"> <select id="query" resultMap="BaseResultMap">

2
frontend/src/business/components/settings/sys/user.vue
View File

@ -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" width="135" prop="email" :label="$t('commons.email')" />
<el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')"> <el-table-column :show-overflow-tooltip="true" prop="dept" :label="$t('commons.organization')">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.dept.name }}</div> <div>{{ scope.row.dept.deptName }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" :label="$t('commons.status')" width="120"> <el-table-column prop="status" :label="$t('commons.status')" width="120">