|
|
@@ -23,7 +23,6 @@ import cn.com.qmth.examcloud.commons.web.security.bean.Role;
|
|
|
import cn.com.qmth.examcloud.commons.web.security.bean.User;
|
|
|
import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
|
|
|
import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
|
|
|
-import cn.com.qmth.examcloud.core.basic.base.enums.UserType;
|
|
|
import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
|
|
|
import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
|
|
|
import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
|
|
|
@@ -102,7 +101,6 @@ public class AuthServiceImpl implements AuthService {
|
|
|
|
|
|
// 常规账户登录
|
|
|
if (AccountType.COMMON_LOGIN_NAME.getCode().equals(accountType)) {
|
|
|
- user.setUserType(UserType.COMMON.getCode());
|
|
|
UserEntity userEntity = userService.getUser(Long.parseLong(rootOrgId), accountValue);
|
|
|
if (null == userEntity) {
|
|
|
throw new StatusException("B-001004", "用户不存在");
|
|
|
@@ -146,7 +144,6 @@ public class AuthServiceImpl implements AuthService {
|
|
|
throw new StatusException("B-001003", "密码错误");
|
|
|
}
|
|
|
|
|
|
- user.setUserType(UserType.STUDENT.getCode());
|
|
|
user.setStudentId(student.getId());
|
|
|
user.setUserId(student.getUserId());
|
|
|
user.setStudentCode(student.getStudentCode());
|
|
|
@@ -251,7 +248,6 @@ public class AuthServiceImpl implements AuthService {
|
|
|
}
|
|
|
|
|
|
User user = new User();
|
|
|
- user.setUserType(UserType.COMMON.getCode());
|
|
|
user.setUserId(userEntity.getId());
|
|
|
user.setDisplayName(userEntity.getLoginName());
|
|
|
user.setRootOrgId(userEntity.getRootOrgId());
|
wangwei