xiatian 2 anni fa
parent
commit
5ccfd0b688

+ 7 - 3
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -236,7 +236,8 @@ public class ExamController extends ControllerSupport {
                                           @RequestParam(required = false) String name,
                                           @RequestParam(required = false) String examType,
                                           @RequestParam(required = false) Boolean enable,
-                                          @RequestParam(required = false) String propertyKeys) {
+                                          @RequestParam(required = false) String propertyKeys,
+                                          @RequestParam(required = false) Long rootOrgId) {
         User accessUser = getAccessUser();
         PageRequest pageable = PageRequest.of(curPage, pageSize, Sort.by(Direction.DESC, "updateTime", "id"));
 
@@ -251,8 +252,11 @@ public class ExamController extends ControllerSupport {
             if (userDataRule.assertNeedQueryRefIds()) {
                 predicates.add(root.get("id").in(userDataRule.getRefIds()));
             }
-
-            predicates.add(cb.equal(root.get("rootOrgId"), accessUser.getRootOrgId()));
+            if(rootOrgId!=null) {
+            	predicates.add(cb.equal(root.get("rootOrgId"), rootOrgId));
+            }else {
+            	predicates.add(cb.equal(root.get("rootOrgId"), accessUser.getRootOrgId()));
+            }
             if (StringUtils.isNotBlank(name)) {
                 predicates.add(cb.like(root.get("name"), toSqlSearchPattern(name)));
             }