|
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
|
import cn.com.qmth.examcloud.commons.base.exception.StatusException;
|
|
import cn.com.qmth.examcloud.commons.base.exception.StatusException;
|
|
|
|
+import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
|
|
import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
|
|
import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
|
|
import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
|
|
import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
|
|
import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
|
|
import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
|
|
@@ -91,11 +92,14 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
|
|
for (UserRole cur : userRoles) {
|
|
for (UserRole cur : userRoles) {
|
|
RoleBean roleBean = new RoleBean();
|
|
RoleBean roleBean = new RoleBean();
|
|
roleBean.setRoleId(cur.getRoleCode());
|
|
roleBean.setRoleId(cur.getRoleCode());
|
|
- roleBean.setRoleName("待完善");
|
|
|
|
|
|
+ String roleName = RoleMeta.valueOf(cur.getRoleCode()).getCnName();
|
|
|
|
+ roleBean.setRoleName(roleName);
|
|
roleList.add(roleBean);
|
|
roleList.add(roleBean);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ userBean.setRoleList(roleList);
|
|
|
|
+
|
|
}
|
|
}
|
|
// 学生学号登录
|
|
// 学生学号登录
|
|
else if (AccountType.STUDENT_CODE.getCode().equals(accountType)) {
|
|
else if (AccountType.STUDENT_CODE.getCode().equals(accountType)) {
|