xiatian 2 years ago
parent
commit
c2e5e55867

+ 8 - 0
src/main/java/cn/com/qmth/mps/vo/user/UserVo.java

@@ -22,6 +22,8 @@ public class UserVo extends BaseEntity{
 	private String loginName;
 	@ApiModelProperty("启用禁用")
 	private Boolean enable;
+	@ApiModelProperty("角色名")
+	private String roleName;
 	@ApiModelProperty("角色")
 	private Long roleId;
 	@ApiModelProperty("科目代码集合")
@@ -82,5 +84,11 @@ public class UserVo extends BaseEntity{
 	public void setCourseNames(List<String> courseNames) {
 		this.courseNames = courseNames;
 	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
 	
 }

+ 2 - 1
src/main/resources/mapper/UserMapper.xml

@@ -3,11 +3,12 @@
 <mapper namespace="cn.com.qmth.mps.dao.UserDao">
 
 	<select id="page" resultType="cn.com.qmth.mps.vo.user.UserVo">
-		select t.*,s.name schoolName from mps_user
+		select t.*,s.name schoolName,r.name roleName from mps_user
 		t
 		left join
 		mps_school s on
 		t.school_id=s.id
+		left join mps_role r on t.role_id=r.id
 		where
 		t.school_id=#{req.schoolId}
 		<if test="req.loginName != null and req.loginName !=''">