From 09f26f12133e264bc3fb153c7a104e35dcaa461c Mon Sep 17 00:00:00 2001 From: andrew-dzak Date: Wed, 26 Mar 2014 00:15:10 -0700 Subject: [PATCH] mifosx-986 fixes from andrew --- ...ferWritePlatformServiceJpaRepositoryImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/transfer/service/TransferWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/transfer/service/TransferWritePlatformServiceJpaRepositoryImpl.java index a23ec31b0..6c5429ade 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/transfer/service/TransferWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/transfer/service/TransferWritePlatformServiceJpaRepositoryImpl.java @@ -191,7 +191,12 @@ public class TransferWritePlatformServiceJpaRepositoryImpl implements TransferWr * loans **/ final Staff destinationGroupLoanOfficer = destinationGroup.getStaff(); - if (destinationGroupLoanOfficer != null) { + + /** In case of a loan officer transfer, set the new loan officer value **/ + if (sourceGroup.getId().equals(destinationGroup.getId()) && newLoanOfficer != null) { + client.updateStaff(newLoanOfficer); + }/*** Else default to destination group Officer (If present) ***/ + else if (destinationGroupLoanOfficer != null) { client.updateStaff(destinationGroupLoanOfficer); } @@ -215,8 +220,13 @@ public class TransferWritePlatformServiceJpaRepositoryImpl implements TransferWr } } - // change client group membership - client.getGroups().remove(sourceGroup); + /** + * change client group membership (only if source group and destination + * group are not the same, i.e only Loan officer Transfer) + **/ + if (!sourceGroup.getId().equals(destinationGroup.getId())) { + client.getGroups().remove(sourceGroup); + } }