xiatian 2 anos atrás
pai
commit
31de4d23a8

+ 2 - 0
src/main/java/cn/com/qmth/mps/service/impl/UserServiceImpl.java

@@ -245,6 +245,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 		IPage<UserVo> iPage = this.baseMapper.page(new Page<UserVo>(query.getPageNumber(), query.getPageSize()), query);
 		if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
 			for (UserVo vo : iPage.getRecords()) {
+				vo.setRole(Role.getById(vo.getRoleId()));
 				if (vo.getRoleId().equals(Role.SECTION_LEADER.getId())) {
 					List<CourseInfo> cs = userCourseRelationService.getCourses(vo.getId());
 					vo.setCourseCodes(cs.stream().map(m -> m.getCode()).collect(Collectors.toList()));
@@ -264,6 +265,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 		vo.setEnable(ue.getEnable());
 		vo.setId(ue.getId());
 		vo.setRoleId(ue.getRoleId());
+		vo.setRole(Role.getById(ue.getRoleId()));
 		vo.setLoginName(ue.getLoginName());
 		vo.setName(ue.getName());
 		vo.setSchoolId(ue.getSchoolId());

+ 10 - 1
src/main/java/cn/com/qmth/mps/vo/user/UserVo.java

@@ -3,6 +3,7 @@ package cn.com.qmth.mps.vo.user;
 import java.util.List;
 
 import cn.com.qmth.mps.entity.base.BaseEntity;
+import cn.com.qmth.mps.enums.Role;
 import io.swagger.annotations.ApiModelProperty;
 
 public class UserVo extends BaseEntity{
@@ -24,8 +25,10 @@ public class UserVo extends BaseEntity{
 	private Boolean enable;
 	@ApiModelProperty("角色名")
 	private String roleName;
-	@ApiModelProperty("角色")
+	@ApiModelProperty("角色ID")
 	private Long roleId;
+	@ApiModelProperty("角色编码")
+	private Role role;
 	@ApiModelProperty("科目代码集合")
 	private List<String> courseCodes;
 	@ApiModelProperty("科目名称集合")
@@ -90,5 +93,11 @@ public class UserVo extends BaseEntity{
 	public void setRoleName(String roleName) {
 		this.roleName = roleName;
 	}
+	public Role getRole() {
+		return role;
+	}
+	public void setRole(Role role) {
+		this.role = role;
+	}
 	
 }