...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -221,8 +221,8 @@ public class UserController extends ControllerSupport {
 	@ApiOperation(value = "模糊查询用户", notes = "")
 	@GetMapping("query")
 	public List<UserDomain> query(@RequestParam(required = false) Long rootOrgId,
-			@RequestParam String loginName, @RequestParam String name,
-			@RequestParam(required = false) Boolean enable,
+			@RequestParam(required = false) Boolean rootOrgIdNull, @RequestParam String loginName,
+			@RequestParam String name, @RequestParam(required = false) Boolean enable,
 			@RequestParam(required = false) Long roleId, @RequestParam(required = false) Long orgId,
 			@RequestParam(required = false) String roleCode) {
 
@@ -265,7 +265,9 @@ public class UserController extends ControllerSupport {
 
 		Specification<UserEntity> specification = (root, query, cb) -> {
 			List<Predicate> predicates = new ArrayList<>();
-			predicates.add(cb.equal(root.get("rootOrgId"), finalRootOrgId));
+			if (null == rootOrgIdNull || !rootOrgIdNull) {
+				predicates.add(cb.equal(root.get("rootOrgId"), finalRootOrgId));
+			}
 
 			if (StringUtils.isNotBlank(loginName)) {
 				predicates.add(cb.like(root.get("loginName"), toSqlSearchPattern(loginName)));