...

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

@@ -98,12 +98,12 @@ public class UserController extends ControllerSupport {
 	 * @return
 	 */
 	@ApiOperation(value = "查询所有用户", notes = "")
-	@GetMapping("/all/{curPage}/{pageSize}")
+	@GetMapping("all/{curPage}/{pageSize}")
 	public PageInfo<UserDomain> getUserPage(@PathVariable Integer curPage,
 			@PathVariable Integer pageSize, @RequestParam Long rootOrgId,
 			@RequestParam String loginName, @RequestParam String name,
 			@RequestParam(required = false) Boolean enable,
-			@RequestParam(required = false) Long roleId,
+			@RequestParam(required = false) Long roleId, @RequestParam(required = false) Long orgId,
 			@RequestParam(required = false) String roleCode) {
 
 		User accessUser = getAccessUser();
@@ -148,6 +148,9 @@ public class UserController extends ControllerSupport {
 			if (StringUtils.isNotBlank(name)) {
 				predicates.add(cb.like(root.get("name"), toSqlSearchPattern(name)));
 			}
+			if (null != orgId) {
+				predicates.add(cb.equal(root.get("orgId"), orgId));
+			}
 			if (null != finalRoleId) {
 				Subquery<UserRoleRelationEntity> subquery = query
 						.subquery(UserRoleRelationEntity.class);