Merge pull request #598 from dataease/pr@dev@feat_panel-up-drill

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

@@ -34,9 +34,16 @@
 
 
     <select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="BaseResultMap">
-        select u.*,u.user_id as id, d.pid, d.name as dept_name
-        from sys_user u
-        left join sys_dept d on d.dept_id = u.dept_id
+        SELECT DISTINCT
+        u.*,
+        u.user_id AS id,
+        d.pid,
+        d.NAME AS dept_name
+        FROM
+        sys_user u
+        LEFT JOIN sys_dept d ON d.dept_id = u.dept_id
+        LEFT JOIN sys_users_roles sur ON sur.user_id = u.user_id
+        LEFT JOIN sys_role r ON r.role_id = sur.role_id
 
         <if test="_parameter != null">
             <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />

frontend/src/views/system/user/index.vue

@@ -208,8 +208,9 @@ export default {
               { label: this.$t('commons.disable'), value: '0' }
             ],
             multiple: false
-          }
-        //   { field: 'deptId', label: '组织', component: conditionTable }
+          },
+          { field: 'd.name', label: this.$t('commons.organization'), component: 'DeComplexInput' },
+          { field: 'r.name', label: this.$t('commons.role'), component: 'DeComplexInput' }
         ]
       },
       paginationConfig: {