CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-1971: Minor bug-fixes

Browse Source
This commit is contained in:
jmarta
2023-10-19 14:18:20 +02:00
committed by Adam Saghy
parent f79891b084
commit 21978cc4e1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/EntityDatatableChecksRepository.java
+2 -1
View File
@@ -37,7 +37,8 @@ public interface EntityDatatableChecksRepository
AND dt.status = :status AND dt.status = :status
AND rdt.subtype = :subtype 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 ") @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, List<EntityDatatableChecks> findByEntityStatusAndProduct(@Param("entity") String entity, @Param("status") Long status,
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+1 -1
View File
@@ -1657,7 +1657,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
} }
private String getGroupOfficeJoinCondition(String officeHierarchy, String appTableAlias) { 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) { private String getOfficeJoinCondition(String officeHierarchy, String joinTableAlias) {
fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepository.java
+2 -1
View File
@@ -40,7 +40,8 @@ public interface ClientRepository extends JpaRepository<Client, Long>, JpaSpecif
WHERE client.id = :clientId WHERE client.id = :clientId
AND (office.hierarchy LIKE :officeHierarchy OR transferToOffice.hierarchy LIKE :transferToOfficeHierarchy) 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") @Query("SELECT c.id FROM Client c WHERE c.externalId = :externalId")
Long findIdByExternalId(@Param("externalId") ExternalId externalId); Long findIdByExternalId(@Param("externalId") ExternalId externalId);