wangwei 6 rokov pred
rodič
commit
67b27313ae

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/CourseGroupOuterServiceProvider.java

@@ -55,7 +55,7 @@ public class CourseGroupOuterServiceProvider extends ControllerSupport
 		Long rootOrgId = req.getRootOrgId();
 		String courseGroupName = req.getCourseGroupName();
 
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamOuterServiceProvider.java

@@ -56,7 +56,7 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
 	public OuterSaveExamResp saveExam(
 			@RequestBody @ApiParam(required = true) OuterSaveExamReq req) {
 
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 

+ 2 - 2
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamStudentOuterServiceProvider.java

@@ -59,7 +59,7 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 	public OuterSaveExamStudentResp saveExamStudent(
 			@RequestBody @ApiParam(required = true) OuterSaveExamStudentReq req) {
 
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
@@ -117,7 +117,7 @@ public class ExamStudentOuterServiceProvider extends ControllerSupport
 	@Override
 	public BatchOuterSaveExamStudentResp batchSaveExamStudent(
 			@RequestBody @ApiParam(required = true) OuterBatchSaveExamStudentReq req) {
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 

+ 3 - 3
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/FaceOuterServiceProvider.java

@@ -68,7 +68,7 @@ public class FaceOuterServiceProvider extends ControllerSupport implements FaceO
 			@RequestParam @ApiParam(value = "照片地址", required = true) String photoUrl,
 			@RequestParam @ApiParam(value = "操作者", required = true) String operator) {
 
-		if (!getSecurityRootOrgId().equals(rootOrgId)) {
+		if (!getEnterpriseRootOrgId().equals(rootOrgId)) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
@@ -106,7 +106,7 @@ public class FaceOuterServiceProvider extends ControllerSupport implements FaceO
 			@RequestParam @ApiParam(value = "操作者", required = true) String operator,
 			@RequestParam @ApiParam(value = "学生照片文件(文件名称=身份证号码+文件后缀) 如:xxxxxxxxxx.jpg", required = true) CommonsMultipartFile file) {
 
-		if (!getSecurityRootOrgId().equals(rootOrgId)) {
+		if (!getEnterpriseRootOrgId().equals(rootOrgId)) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
@@ -134,7 +134,7 @@ public class FaceOuterServiceProvider extends ControllerSupport implements FaceO
 			@RequestParam @ApiParam(value = "操作者", required = true) String operator,
 			@RequestParam @ApiParam(value = "学生照片文件(身份证号码+文件后缀)压缩包(ZIP文件,压缩包内不含目录)", required = true) CommonsMultipartFile file) {
 
-		if (!getSecurityRootOrgId().equals(rootOrgId)) {
+		if (!getEnterpriseRootOrgId().equals(rootOrgId)) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/GetExamRecordAuditInfoServiceProvider.java

@@ -40,7 +40,7 @@ public class GetExamRecordAuditInfoServiceProvider  extends ControllerSupport im
 	@PostMapping("/getExamRecordAuditInfo")
 	@Override
 	public OuterGetExamRecordAuditInfoResp getExamRecordAuditInfo(@RequestBody OuterGetExamRecordAuditInfoReq req) {
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 		if (req.getExamRecordDataId()==null) {

+ 2 - 2
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/GetScoreDataServiceProvider.java

@@ -53,7 +53,7 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 		if(req.getRootOrgId() == null){
 			throw new StatusException("1000001", "rootOrgId不能为空");
 		}
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000002", "rootOrgId错误");
 		}
 		if (req.getExamRecordDataId()==null) {
@@ -90,7 +90,7 @@ public class GetScoreDataServiceProvider extends ControllerSupport implements Ge
 		if(req.getRootOrgId() == null){
 			throw new StatusException("1000001", "rootOrgId不能为空");
 		}
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000002", "rootOrgId错误");
 		}
 		if(StringUtils.isBlank(req.getExamName())){

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/QueryCapturePhotoServiceProvider.java

@@ -45,7 +45,7 @@ public class QueryCapturePhotoServiceProvider extends ControllerSupport implemen
 	@PostMapping("/queryCapturePhoto")
 	@Override
 	public OuterQueryCapturePhotoResp queryCapturePhotoList(@RequestBody OuterQueryCapturePhotoReq req) {
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 		if (req.getExamRecordDataId()==null) {

+ 2 - 2
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ScoreQueueServiceProvider.java

@@ -51,7 +51,7 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 	@PostMapping("/getScoreQueueTop")
 	@Override
 	public OuterGetScoreQueueTopResp getScoreQueueTop(@RequestBody OuterGetScoreQueueTopReq req) {
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 		GetTopExamScoreQueueReq getTopExamScoreQueueReq = new GetTopExamScoreQueueReq();
@@ -89,7 +89,7 @@ public class ScoreQueueServiceProvider extends ControllerSupport implements Scor
 	@PostMapping("/deleteScoreQueueTop")
 	@Override
 	public OuterDeleteScoreQueueTopResp deleteScoreQueueTop(@RequestBody OuterDeleteScoreQueueTopReq req) {
-		if (!getSecurityRootOrgId().equals(req.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(req.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 		GetTopExamScoreQueueReq getTopExamScoreQueueReq = new GetTopExamScoreQueueReq();

+ 2 - 2
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/StudentOuterServiceProvider.java

@@ -68,7 +68,7 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
 			@RequestBody @ApiParam(required = true) OuterSaveStudentReq req) {
 		trim(req);
 		Long rootOrgId = req.getRootOrgId();
-		if (!getSecurityRootOrgId().equals(rootOrgId)) {
+		if (!getEnterpriseRootOrgId().equals(rootOrgId)) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 
@@ -155,7 +155,7 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
 	@Override
 	public BatchOuterSaveStudentResp batchSaveStudent(
 			@RequestBody @ApiParam(required = true) OuterBatchSaveStudentReq outerBatchSaveStudentReq) {
-		if (!getSecurityRootOrgId().equals(outerBatchSaveStudentReq.getRootOrgId())) {
+		if (!getEnterpriseRootOrgId().equals(outerBatchSaveStudentReq.getRootOrgId())) {
 			throw new StatusException("1000001", "rootOrgId is wrong");
 		}
 		List<Student4BatchBean> studentList = outerBatchSaveStudentReq.getStudentList();