Merge remote-tracking branch 'origin/master'

edu-common/src/main/java/com/keao/edu/common/controller/BaseController.java

@@ -74,7 +74,8 @@ public class BaseController {
 		} else if (e instanceof AccessDeniedException) {
 			return failed("禁止访问");
 		}
-		return failed("系统繁忙");
+//		return failed("系统繁忙");
+		return failed(e.getMessage());
 	}
 
 }

edu-user/edu-user-server/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -30,8 +30,9 @@
 
     <!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="Employee" >
-		SELECT * FROM employee e
+		SELECT e.*,su.*,sur.role_id_ FROM employee e
 		LEFT JOIN sys_user su ON e.user_id_ = su.id_
+		LEFT JOIN sys_user_role sur ON e.user_id_ = sur.id_
 		WHERE e.user_id_ = #{userId}
 	</select>
 	

edu-user/edu-user-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -30,6 +30,9 @@
         <result column="wechat_id_" property="wechatId"/>
         <result column="is_super_admin_" property="isSuperAdmin"/>
         <result column="tenant_id_" property="tenantId"/>
+        <collection property="roles" ofType="int" javaType="list">
+            <result column="role_id_"/>
+        </collection>
     </resultMap>
 
     <resultMap id="BaseUserInfoDto" type="com.keao.edu.user.dto.BaseUserInfoDto">