From cef41855a2dd58d79bf84bfff9408812506a7bd8 Mon Sep 17 00:00:00 2001 From: Nazeer Hussain Shaik Date: Mon, 4 Dec 2017 10:46:13 +0530 Subject: [PATCH] FINERACT-571 Unable to transfer clients from one group to another group even though both groups are under same center and office --- .../portfolio/calendar/domain/CalendarInstanceRepository.java | 2 +- .../portfolio/group/service/GroupReadPlatformServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java index 8b1ea7ec4..d51b37815 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java @@ -50,7 +50,7 @@ public interface CalendarInstanceRepository extends JpaRepository findByCalendarIdAndEntityTypeId(Long calendarId, Integer entityTypeId); /** Should use in clause, can I do it without creating a new class? **/ - @Query("select ci from CalendarInstance ci where ci.entityId in (select id from Loan loan where loan.client.id = :clientId and loan.group.id = :groupId and (loan.loanStatus = 100 or loan.loanStatus = 200 or loan.loanStatus = 300)) and ci.entityTypeId = 3") + @Query("select ci from CalendarInstance ci where ci.entityId in (select loan.id from Loan loan where loan.client.id = :clientId and loan.group.id = :groupId and (loan.loanStatus = 100 or loan.loanStatus = 200 or loan.loanStatus = 300)) and ci.entityTypeId = 3") List findCalendarInstancesForActiveLoansByGroupIdAndClientId(@Param("groupId") Long groupId, @Param("clientId") Long clientId); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java index 8dd0ed61a..af28a3184 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java @@ -234,7 +234,7 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService { final String name = searchCriteria.getName(); if (name != null) { - paramList.add(ApiParameterHelper.sqlEncodeString("%" + name + "%")); + paramList.add("%" + name + "%"); extraCriteria.append(" and g.display_name like ? "); }