侯茂昌 пре 1 година
родитељ
комит
a24b3641af

+ 29 - 0
ruoyi-common/src/main/java/com/ruoyi/common/exception/tenantdatassource/TenantDataSource.java

@@ -0,0 +1,29 @@
+package com.ruoyi.common.exception.tenantdatassource;
+
+/**
+ * @author hanzihang
+ * @date 2023/9/20 5:16
+ */
+public class TenantDataSource extends RuntimeException {
+
+    public TenantDataSource() {
+        super();
+    }
+
+    public TenantDataSource(String message) {
+        super(message);
+    }
+
+    public TenantDataSource(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public TenantDataSource(Throwable cause) {
+        super(cause);
+    }
+
+    public TenantDataSource(Object message, Object code) {
+        super(message.toString());
+    }
+
+}

+ 5 - 5
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -98,12 +98,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0' and r.tenant_id = #{tenantId} limit 1
 	</select>
-	<select id="selectUserRoleKeyByUserId"  resultType="string" parameterType="long">
-		SELECT sr.role_key FROM `sys_user` as sy
-				inner JOIN  sys_user_role  sur on (sy.user_id=sur.user_id)
-				inner join  sys_role       sr  on (sur.role_id=sr.role_id)  where sy.user_id=#{userId}
-	</select>
 
+	<select id="selectUserRoleKeyByUserId" parameterType="long" resultType="string">
+			SELECT sr.role_key FROM `sys_user` as sy
+			inner JOIN  sys_user_role  sur on (sy.user_id=sur.user_id)
+			inner join  sys_role       sr  on (sur.role_id=sr.role_id)  where sy.user_id=#{userId}
+	</select>
 
 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(