|
@@ -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);
|
|
IPage<UserVo> iPage = this.baseMapper.page(new Page<UserVo>(query.getPageNumber(), query.getPageSize()), query);
|
|
if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
|
|
if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
|
|
for (UserVo vo : iPage.getRecords()) {
|
|
for (UserVo vo : iPage.getRecords()) {
|
|
|
|
+ vo.setRole(Role.getById(vo.getRoleId()));
|
|
if (vo.getRoleId().equals(Role.SECTION_LEADER.getId())) {
|
|
if (vo.getRoleId().equals(Role.SECTION_LEADER.getId())) {
|
|
List<CourseInfo> cs = userCourseRelationService.getCourses(vo.getId());
|
|
List<CourseInfo> cs = userCourseRelationService.getCourses(vo.getId());
|
|
vo.setCourseCodes(cs.stream().map(m -> m.getCode()).collect(Collectors.toList()));
|
|
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.setEnable(ue.getEnable());
|
|
vo.setId(ue.getId());
|
|
vo.setId(ue.getId());
|
|
vo.setRoleId(ue.getRoleId());
|
|
vo.setRoleId(ue.getRoleId());
|
|
|
|
+ vo.setRole(Role.getById(ue.getRoleId()));
|
|
vo.setLoginName(ue.getLoginName());
|
|
vo.setLoginName(ue.getLoginName());
|
|
vo.setName(ue.getName());
|
|
vo.setName(ue.getName());
|
|
vo.setSchoolId(ue.getSchoolId());
|
|
vo.setSchoolId(ue.getSchoolId());
|