remove require for searchMemberName and searchGroupId.

dragonpoo · dragonpoo · commit 77d8b02d8c5f · 2025-06-16T18:49:06.000-04:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -119,14 +119,15 @@ public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String
                 .map(ResponseView::success));
     }
     @Override
-    public Mono<ResponseView<OrgMemberListView>> getOrgMembersForSearch(@PathVariable String orgId,
-            @PathVariable String searchMemberName,
-            @PathVariable String searchGroupId,
+    public Mono<ResponseView<OrgMemberListView>> getOrgMembersForSearch(
+            @PathVariable String orgId,
+            @RequestParam(required = false) String searchMemberName,
+            @RequestParam(required = false) String searchGroupId,
             @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "1000") int pageSize) {
         return gidService.convertOrganizationIdToObjectId(orgId).flatMap(id ->
-            orgApiService.getOrganizationMembersForSearch(id, searchMemberName, searchGroupId, pageNum, pageSize)
-                .map(ResponseView::success));
+                orgApiService.getOrganizationMembersForSearch(id, searchMemberName, searchGroupId, pageNum, pageSize)
+                        .map(ResponseView::success));
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java
@@ -98,12 +98,13 @@ public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String
             @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "1000") int pageSize);
 
-	@GetMapping("/{orgId}/{searchMemberName}/{searchGroupId}/members")
-	public Mono<ResponseView<OrgMemberListView>> getOrgMembersForSearch(@PathVariable String orgId,
-		   @PathVariable String searchMemberName,
-		   @PathVariable String searchGroupId,
-		   @RequestParam(required = false, defaultValue = "1") int pageNum,
-		   @RequestParam(required = false, defaultValue = "1000") int pageSize);
+	@GetMapping("/{orgId}/members/search")
+	public Mono<ResponseView<OrgMemberListView>> getOrgMembersForSearch(
+			@PathVariable String orgId,
+			@RequestParam(required = false) String searchMemberName,
+			@RequestParam(required = false) String searchGroupId,
+			@RequestParam(required = false, defaultValue = "1") int pageNum,
+			@RequestParam(required = false, defaultValue = "1000") int pageSize);
 
 	@Operation(
 			tags = TAG_ORGANIZATION_MEMBERS,
