wangwei hace 6 años
padre
commit
651c9ac188

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

@@ -116,8 +116,7 @@ public class OrgCloudServiceProvider extends ControllerSupport implements OrgClo
 
 	@Override
 	public GetOrgsResp getOrgs(@RequestBody GetOrgsReq req) {
-
-		Long parentId = req.getParentId();
+		Long rootOrgId = req.getRootOrgId();
 
 		final long start = null == req.getStart() ? 1 : req.getStart();
 
@@ -125,11 +124,7 @@ public class OrgCloudServiceProvider extends ControllerSupport implements OrgClo
 
 		Specification<OrgEntity> specification = (root, query, cb) -> {
 			List<Predicate> predicates = new ArrayList<>();
-			if (null == parentId) {
-				predicates.add(cb.isNull(root.get("parentId")));
-			} else {
-				predicates.add(cb.equal(root.get("parentId"), parentId));
-			}
+			predicates.add(cb.equal(root.get("rootId"), rootOrgId));
 
 			predicates.add(cb.greaterThanOrEqualTo(root.get("id"), start));