From f59f18eaeb7d808abb7afa5364c81936cd44a9b2 Mon Sep 17 00:00:00 2001
From: mifoscontributer <mifos.contributer@gmail.com>
Date: Thu, 22 Aug 2013 19:44:01 +0530
Subject: [PATCH] Fix for Retrieve group loanofficers for ASSIGN LOANOFFICER
 template

---
 .../portfolio/loanaccount/data/LoanAccountData.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
index 7efb7b178..6227e5999 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/data/LoanAccountData.java
@@ -835,7 +835,11 @@ public class LoanAccountData {
     }
 
     public Long officeId() {
-        return this.clientOfficeId;
+        Long officeId = this.clientOfficeId;
+        if (officeId == null) {
+            officeId = groupOfficeId();
+        }
+        return officeId;
     }
 
     public Long loanOfficerId() {