Merge remote-tracking branch 'origin/dev_v5.0.4' into dev_v5.0.4

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/bean/MarkTaskBean.java

@@ -45,7 +45,6 @@ public class MarkTaskBean implements JsonSerializable {
     private Long rootOrgId;
     
     private Boolean exceedLimit;
-    private Long orgId;
 
     public MarkTaskBean() {
     }
@@ -250,13 +249,4 @@ public class MarkTaskBean implements JsonSerializable {
 		this.exceedLimit = exceedLimit;
 	}
 
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-    
-    
 }

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetMarkTaskReq.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.request;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
 
 /**
  * @ClassName GetMarkTaskReq
@@ -14,6 +15,7 @@ public class GetMarkTaskReq extends BaseRequest {
     private Long workId;
     private Long userId;
     private String courseCode;
+    private UserDataRule orgUd;
 
     public Long getWorkId() {
         return workId;
@@ -46,5 +48,13 @@ public class GetMarkTaskReq extends BaseRequest {
 	public void setRootOrgId(Long rootOrgId) {
 		this.rootOrgId = rootOrgId;
 	}
+
+	public UserDataRule getOrgUd() {
+		return orgUd;
+	}
+
+	public void setOrgUd(UserDataRule orgUd) {
+		this.orgUd = orgUd;
+	}
     
 }

examcloud-core-marking-api/src/main/java/cn/com/qmth/examcloud/marking/api/request/GetStudentPaperReq.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.request;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
 
 /**
  * @ClassName StudentPaperReq
@@ -17,6 +18,7 @@ public class GetStudentPaperReq extends BaseRequest {
      * 阅卷任务表ID---ecs_marking_mark_task
      */
     private Long markTaskId;
+    private UserDataRule orgUd;
 
     /**
      * 待阅卷的考卷信息表ID---ecs_marking_student_paper
@@ -38,4 +40,14 @@ public class GetStudentPaperReq extends BaseRequest {
     public void setStudentPaperId(Long studentPaperId) {
         this.studentPaperId = studentPaperId;
     }
+
+	public UserDataRule getOrgUd() {
+		return orgUd;
+	}
+
+	public void setOrgUd(UserDataRule orgUd) {
+		this.orgUd = orgUd;
+	}
+
+    
 }