[fineract] branch develop updated: FINERACT-1971: Minor bug-fixes

[adamsaghy]

This is an automated email from the ASF dual-hosted git repository.

adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 21978cc4e FINERACT-1971: Minor bug-fixes
21978cc4e is described below

commit 21978cc4e1cdb5f8ea51722a10493e8508e1201a
Author: jmarta <marta.jankov...@dpc.hu>
AuthorDate: Tue Oct 10 01:47:48 2023 +0200

    FINERACT-1971: Minor bug-fixes
---
 .../dataqueries/domain/EntityDatatableChecksRepository.java            | 3 ++-
 .../dataqueries/service/ReadWriteNonCoreDataServiceImpl.java           | 2 +-
 .../org/apache/fineract/portfolio/client/domain/ClientRepository.java  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/EntityDatatableChecksRepository.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/EntityDatatableChecksRepository.java
index fa92b24bd..eec7e0eff 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/EntityDatatableChecksRepository.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/EntityDatatableChecksRepository.java
@@ -37,7 +37,8 @@ public interface EntityDatatableChecksRepository
                 AND dt.status = :status
                 AND rdt.subtype = :subtype
             """)
-    List<EntityDatatableChecks> findByEntityAndStatusAndSubtype(String entity, 
Integer status, String subtype);
+    List<EntityDatatableChecks> 
findByEntityAndStatusAndSubtype(@Param("entity") String entity, 
@Param("status") Integer status,
+            @Param("subtype") String subtype);
 
     @Query("select t from  EntityDatatableChecks t WHERE t.status =:status and 
t.entity=:entity and t.productId = :productId ")
     List<EntityDatatableChecks> findByEntityStatusAndProduct(@Param("entity") 
String entity, @Param("status") Long status,
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
index 2ff1f24f0..70c3a2ee0 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
@@ -1657,7 +1657,7 @@ public class ReadWriteNonCoreDataServiceImpl implements 
ReadWriteNonCoreDataServ
     }
 
     private String getGroupOfficeJoinCondition(String officeHierarchy, String 
appTableAlias) {
-        return " join m_group g on g.id = " + appTableAlias + ".client_id " + 
getOfficeJoinCondition(officeHierarchy, "g");
+        return " join m_group g on g.id = " + appTableAlias + ".group_id " + 
getOfficeJoinCondition(officeHierarchy, "g");
     }
 
     private String getOfficeJoinCondition(String officeHierarchy, String 
joinTableAlias) {
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java
 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java
index e6db66606..f3a9ff112 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java
@@ -40,7 +40,8 @@ public interface ClientRepository extends 
JpaRepository<Client, Long>, JpaSpecif
             WHERE client.id = :clientId
             AND (office.hierarchy LIKE :officeHierarchy OR 
transferToOffice.hierarchy LIKE :transferToOfficeHierarchy)
                 """)
-    Client fetchByClientIdAndHierarchy(Long clientId, String officeHierarchy, 
String transferToOfficeHierarchy);
+    Client fetchByClientIdAndHierarchy(@Param("clientId") Long clientId, 
@Param("officeHierarchy") String officeHierarchy,
+            @Param("transferToOfficeHierarchy") String 
transferToOfficeHierarchy);
 
     @Query("SELECT c.id FROM Client c WHERE c.externalId = :externalId")
     Long findIdByExternalId(@Param("externalId") ExternalId externalId);