Revert "update 完善查找所有管理员信息;新增角色id过滤字段"

This reverts commit 69a200a29f00e0d2035a04d5fe97970c2d201f2c.

game/game_cluster/nodes/webadmin/entity/admin.go

@@ -53,7 +53,6 @@ type AdminFindAllReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	Username string `json:"username"`
-	RoleId   string `json:"role_id"` // 角色ID 对应角色表的name
 }
 
 type AdminUpdateStatusReq struct {

game/game_cluster/nodes/webadmin/service/admin.go

@@ -326,9 +326,6 @@ func (a *Admin) FindAll(ctx context.Context, req entity.AdminFindAllReq) (*entit
 	if req.Username != "" {
 		filter["username"] = bson.M{"$regex": escapeRegex(req.Username), "$options": "i"}
 	}
-	if req.RoleId != "" {
-		filter["role_id"] = req.RoleId
-	}
 	// 查询总数
 	count, err := mdb.MDB.Collection("admin").CountDocuments(ctx, filter)
 	if err != nil {
@@ -396,8 +393,12 @@ func (a *Admin) FindAll(ctx context.Context, req entity.AdminFindAllReq) (*entit
 }
 
 func (a *Admin) GetRoleName(roleID string) (string, error) {
+	objID, err := primitive.ObjectIDFromHex(roleID)
+	if err != nil {
+		return "", err
+	}
 	var role models.Roles
-	err := mdb.MDB.Collection(role.TableName()).FindOne(context.Background(), bson.M{"name": roleID}).Decode(&role)
+	err = mdb.MDB.Collection(role.TableName()).FindOne(context.Background(), bson.M{"_id": objID}).Decode(&role)
 	return role.Name, err
 }