wangwei 7 years ago
parent
commit
1cf3e03a74

+ 4 - 0
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/OrgCloudServiceProvider.java

@@ -96,6 +96,10 @@ public class OrgCloudServiceProvider extends ControllerSupport implements OrgClo
 	public GetOrgResp getOrg(@RequestBody GetOrgReq req) {
 		Long orgId = req.getOrgId();
 
+		if (null == orgId) {
+			throw new StatusException("B-150000", "orgId is null");
+		}
+
 		Org org = orgRepo.findOne(orgId);
 
 		if (null == org) {

+ 5 - 1
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentServiceImpl.java

@@ -152,8 +152,12 @@ public class StudentServiceImpl implements StudentService {
 				org.setParentId(rootOrgId);
 				org.setCode(orgCode);
 				org.setName(orgName);
+				org.setEnable(true);
+				org.setRootId(rootOrgId);
 				Org saved = orgRepo.save(org);
 				orgId = saved.getId();
+			} else {
+				orgId = org.getId();
 			}
 		}
 
@@ -238,7 +242,7 @@ public class StudentServiceImpl implements StudentService {
 		if (null != studentInfo.getEnable()) {
 			student.setEnable(studentInfo.getEnable());
 		}
-		Student saved = studentRepo.save(student);
+		Student saved = studentRepo.saveAndFlush(student);
 
 		return saved;
 	}