。。。

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java

@@ -47,13 +47,13 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 
 	@Autowired
 	UserService userService;
-	
+
 	@Autowired
 	UserRepo userRepo;
 
 	@Autowired
 	OrgRepo orgRepo;
-	
+
 	@Autowired
 	StudentRepo studentRepo;
 
@@ -71,12 +71,13 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 
 			rootOrg = orgRepo.findFirstByParentIdAndCode(0L, req.getDomain());
 
+			if (null == rootOrg) {
+				throw new StatusException("B-001002", "机构不存在");
+			}
+
 			rootOrgId = String.valueOf(rootOrg.getRootId());
 
-			if (StringUtils.isBlank(rootOrgId)) {
-				throw new StatusException("B-001002", "domain错误");
-			}
-		}else{
+		} else {
 			rootOrg = orgRepo.findOne(Long.valueOf(rootOrgId));
 		}
 
@@ -100,7 +101,7 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 			userBean.setUserId(user.getId());
 			userBean.setDisplayName(user.getLoginName());
 			userBean.setRootOrgId(user.getRootOrgId());
-			userBean.setRootOrgName(rootOrg!=null?rootOrg.getName():null);
+			userBean.setRootOrgName(rootOrg != null ? rootOrg.getName() : null);
 			userBean.setOrgId(user.getOrgId());
 			List<UserRole> userRoles = user.getUserRoles();
 			ArrayList<RoleBean> roleList = Lists.newArrayList();
@@ -120,13 +121,15 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 		}
 		// 学生学号登录
 		else if (AccountType.STUDENT_CODE.getCode().equals(accountType)) {
-	        Student student = studentRepo.findByStudentCodeAndRootOrgId(accountValue, rootOrg.getId());
-	        userBean = setStudentUserInfo(password,student);
+			Student student = studentRepo.findByStudentCodeAndRootOrgId(accountValue,
+					rootOrg.getId());
+			userBean = setStudentUserInfo(password, student);
 		}
 		// 学生身份证号登录
 		else if (AccountType.STUDENT_IDENTITY_NUMBER.getCode().equals(accountType)) {
-			Student student = studentRepo.findByIdentityNumberAndRootOrgId(accountValue,rootOrg.getId());
-			userBean = setStudentUserInfo(password,student);
+			Student student = studentRepo.findByIdentityNumberAndRootOrgId(accountValue,
+					rootOrg.getId());
+			userBean = setStudentUserInfo(password, student);
 		}
 
 		LoginResp resp = new LoginResp();
@@ -134,29 +137,29 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 
 		return resp;
 	}
-	
-	private UserBean setStudentUserInfo(String password,Student student){
+
+	private UserBean setStudentUserInfo(String password, Student student) {
 		UserBean userBean = new UserBean();
 		if (null == student) {
 			throw new StatusException("B-001005", "学生信息不存在");
 		}
-        User user = userRepo.findOne(student.getUser().getId());
+		User user = userRepo.findOne(student.getUser().getId());
 		String rightPassword = user.getPassword();
 		if (!rightPassword.equals(password)) {
 			throw new StatusException("B-001003", "密码错误");
 		}
 		userBean.setUserType(UserType.STUDENT.getCode());
-		userBean.setUserId(student.getId());		//学生userid存studentId
+		userBean.setUserId(student.getId()); // 学生userid存studentId
 		userBean.setDisplayName(user.getName());
 		userBean.setRootOrgId(user.getRootOrgId());
 		userBean.setOrgId(user.getOrgId());
 		userBean.setStudentCode(student.getStudentCode());
 		userBean.setIdentityNumber(student.getIdentityNumber());
-		//设置学生角色
+		// 设置学生角色
 		ArrayList<RoleBean> roleList = Lists.newArrayList();
-		roleList.add(new RoleBean(RoleMeta.STUDENT.name(),RoleMeta.STUDENT.getCnName()));
+		roleList.add(new RoleBean(RoleMeta.STUDENT.name(), RoleMeta.STUDENT.getCnName()));
 		userBean.setRoleList(roleList);
-		
+
 		Org org = orgRepo.findOne(user.getOrgId());
 		userBean.setOrgName(org.getName());
 		return userBean;