Issue:
Bug: Modify List Merchant Accounts in Org with org_id (v1) hotfix



Modify List Merchant Accounts in Org with org_id (v1) as v2 merchant accounts will hav merchant_id as Null, and they cant be deserialized into v1.

This will cause terminate_2fa API to fail and cant obtain the merchant_id required to generate the jwt token.

Pull request description:


## Type of Change
<!-- Put an `x` in the boxes that apply -->

- [x] Bugfix
- [ ] New feature
- [ ] Enhancement
- [ ] Refactoring
- [ ] Dependency updates
- [ ] Documentation
- [ ] CI/CD

## Description
<!-- Describe your changes in detail -->
Hotfix PR
Original PR: [https://github.com/juspay/hyperswitch/pull/7782](https://github.com/juspay/hyperswitch/pull/7782)

### Additional Changes

- [ ] This PR modifies the API contract
- [ ] This PR modifies the database schema
- [ ] This PR modifies application configuration/environment variables

<!--
Provide links to the files with corresponding changes.

Following are the paths where you can find config files:
1. `config`
2. `crates/router/src/configs`
3. `loadtest/config`
-->


## Motivation and Context
<!--
Why is this change required? What problem does it solve?
If it fixes an open issue, please link to the issue here.

If you don't have an issue, we'd recommend starting with one first so the PR
can focus on the implementation (unless it is an obvious bug or documentation fix
that will have little conversation).
-->


## How did you test it?
<!--
Did you write an integration/unit/API test to verify the code changes?
Or did you test this change manually (provide relevant screenshots)?
-->


## Checklist
<!-- Put an `x` in the boxes that apply -->

- [ ] I formatted the code `cargo +nightly fmt --all`
- [ ] I addressed lints thrown by `cargo clippy`
- [ ] I reviewed the submitted code
- [ ] I added unit tests for my changes where possible


Testing:

Patch:
diff --git a/crates/diesel_models/src/query/merchant_account.rs b/crates/diesel_models/src/query/merchant_account.rs
index c40af7f6535..ab51953b6ef 100644
--- a/crates/diesel_models/src/query/merchant_account.rs
+++ b/crates/diesel_models/src/query/merchant_account.rs
@@ -1,4 +1,5 @@
-use diesel::{associations::HasTable, ExpressionMethods, Table};
+use common_types::consts::API_VERSION;
+use diesel::{associations::HasTable, BoolExpressionMethods, ExpressionMethods, Table};
 
 use super::generics;
 #[cfg(feature = "v1")]
@@ -101,7 +102,9 @@ impl MerchantAccount {
             _,
         >(
             conn,
-            dsl::organization_id.eq(organization_id.to_owned()),
+            dsl::organization_id
+                .eq(organization_id.to_owned())
+                .and(dsl::version.eq(API_VERSION)),
             None,
             None,
             None,