获取数据源类型

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysTenant.java

@@ -47,6 +47,8 @@ public class SysTenant extends BaseEntity
     /** 数据源id */
     private Long datasourceId;
 
+    private DataSource dataSource;
+
     public Long getTenantId() {
         return tenantId;
     }
@@ -114,6 +116,14 @@ public class SysTenant extends BaseEntity
         this.datasourceId = datasourceId;
     }
 
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    public void setDataSource(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -129,6 +139,7 @@ public class SysTenant extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("datasourceId",getTenantId())
+            .append("dataSource",getDataSource())
             .toString();
     }
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -46,6 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="tenantName"  column="tenant_name"   />
 		<result property="tenantCode" column="tenant_code"   />
 		<result property="owner"  column="owner"   />
+		<association property="dataSource"    column="datasource_id" javaType="DataSource" resultMap="dataSourceResult" />
+	</resultMap>
+
+	<resultMap id="dataSourceResult" type="DataSource">
+		<id     property="id"    column="id"     />
+		<result property="databaseType"  column="database_type"   />
 	</resultMap>
 	
     <resultMap id="RoleResult" type="SysRole">
@@ -61,12 +67,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
 		te.tenant_id, te.tenant_name, te.tenant_code, te.owner,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
+			   ds.id,ds.database_type
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_tenant te on u.tenant_id = te.tenant_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
+			left join data_source ds on te.datasource_id = ds.id
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">