WANG 5 жил өмнө
parent
commit
dca1ab4ef1

+ 3 - 1
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/StudentController.java

@@ -166,10 +166,11 @@ public class StudentController extends ControllerSupport {
 					StudentCacheBean student = CacheHelper.getStudent(accessUser.getUserId());
 					Long orgId = student.getOrgId();
 					predicates.add(cb.equal(root.get("orgId"), orgId));
+				} else {
+					predicates.add(cb.equal(root.get("orgId"), -1));
 				}
 			} else if (!isSuperAdmin()) {
 				if (!allStudentData) {
-					// 查询不到数据
 					predicates.add(cb.equal(root.get("orgId"), -1));
 				}
 			}
@@ -224,6 +225,7 @@ public class StudentController extends ControllerSupport {
 						OrgEntity.class);
 				if (null != org) {
 					bean.setOrgName(org.getName());
+					bean.setOrgCode(org.getCode());
 				}
 			}
 

+ 10 - 0
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/StudentDomain.java

@@ -36,6 +36,8 @@ public class StudentDomain implements JsonSerializable {
 
 	private Long orgId;
 
+	private String orgCode;
+
 	private String orgName;
 
 	private Long rootOrgId;
@@ -176,4 +178,12 @@ public class StudentDomain implements JsonSerializable {
 		this.creationTime = creationTime;
 	}
 
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
 }