diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 4d5ec8f2..5c138551 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -1860,7 +1860,9 @@ export class OrganizationController extends Controller {
         .map((x0: PosMaster) => ({
           personID: x0.current_holder.id,
           name: x0.current_holder.firstName,
-          avatar: x0.current_holder.avatar,
+          avatar: x0.current_holder && x0.current_holder.avatar != null && x0.current_holder.avatarName != null 
+            ? `${x0.current_holder.avatar}/${x0.current_holder.avatarName}`
+            : null,
           positionName: x0.current_holder.position,
           positionNum: x0.orgRoot.orgRootShortName + x0.posMasterNo,
           positionNumInt: x0.posMasterNo,
@@ -1871,7 +1873,9 @@ export class OrganizationController extends Controller {
             .map((x1: PosMaster) => ({
               personID: x1.current_holder.id,
               name: x1.current_holder.firstName,
-              avatar: x1.current_holder.avatar,
+              avatar: x1.current_holder && x1.current_holder.avatar != null && x1.current_holder.avatarName != null 
+                ? `${x1.current_holder.avatar}/${x1.current_holder.avatarName}`
+                : null,
               positionName: x1.current_holder.position,
               positionNum: x1.orgChild1.orgChild1ShortName + x1.posMasterNo,
               positionNumInt: x1.posMasterNo,
@@ -1882,7 +1886,9 @@ export class OrganizationController extends Controller {
                 .map((x2: PosMaster) => ({
                   personID: x2.current_holder.id,
                   name: x2.current_holder.firstName,
-                  avatar: x2.current_holder.avatar,
+                  avatar: x2.current_holder && x2.current_holder.avatar != null && x2.current_holder.avatarName != null 
+                    ? `${x2.current_holder.avatar}/${x2.current_holder.avatarName}`
+                    : null,
                   positionName: x2.current_holder.position,
                   positionNum: x2.orgChild2.orgChild2ShortName + x2.posMasterNo,
                   positionNumInt: x2.posMasterNo,
@@ -1893,7 +1899,9 @@ export class OrganizationController extends Controller {
                     .map((x3: PosMaster) => ({
                       personID: x3.current_holder.id,
                       name: x3.current_holder.firstName,
-                      avatar: x3.current_holder.avatar,
+                      avatar: x3.current_holder && x3.current_holder.avatar != null && x3.current_holder.avatarName != null 
+                        ? `${x3.current_holder.avatar}/${x3.current_holder.avatarName}`
+                        : null,
                       positionName: x3.current_holder.position,
                       positionNum: x3.orgChild3.orgChild3ShortName + x3.posMasterNo,
                       positionNumInt: x3.posMasterNo,
@@ -1906,7 +1914,9 @@ export class OrganizationController extends Controller {
                         .map((x4: PosMaster) => ({
                           personID: x4.current_holder.id,
                           name: x4.current_holder.firstName,
-                          avatar: x4.current_holder.avatar,
+                          avatar: x4.current_holder && x4.current_holder.avatar != null && x4.current_holder.avatarName != null 
+                            ? `${x4.current_holder.avatar}/${x4.current_holder.avatarName}`
+                            : null,
                           positionName: x4.current_holder.position,
                           positionNum: x4.orgChild4.orgChild4ShortName + x4.posMasterNo,
                           positionNumInt: x4.posMasterNo,
@@ -1980,7 +1990,9 @@ export class OrganizationController extends Controller {
         .map((x0: PosMaster) => ({
           personID: x0.next_holder.id,
           name: x0.next_holder.firstName,
-          avatar: x0.next_holder.avatar,
+          avatar: x0.next_holder && x0.next_holder.avatar != null && x0.next_holder.avatarName != null 
+            ? `${x0.next_holder.avatar}/${x0.next_holder.avatarName}`
+            : null,
           positionName: x0.next_holder.position,
           positionNum: x0.orgRoot.orgRootShortName + x0.posMasterNo,
           positionNumInt: x0.posMasterNo,
@@ -1991,7 +2003,9 @@ export class OrganizationController extends Controller {
             .map((x1: PosMaster) => ({
               personID: x1.next_holder.id,
               name: x1.next_holder.firstName,
-              avatar: x1.next_holder.avatar,
+              avatar: x1.next_holder && x1.next_holder.avatar != null && x1.next_holder.avatarName != null 
+                ? `${x1.next_holder.avatar}/${x1.next_holder.avatarName}`
+                : null,
               positionName: x1.next_holder.position,
               positionNum: x1.orgChild1.orgChild1ShortName + x1.posMasterNo,
               positionNumInt: x1.posMasterNo,
@@ -2002,7 +2016,9 @@ export class OrganizationController extends Controller {
                 .map((x2: PosMaster) => ({
                   personID: x2.next_holder.id,
                   name: x2.next_holder.firstName,
-                  avatar: x2.next_holder.avatar,
+                  avatar: x2.next_holder && x2.next_holder.avatar != null && x2.next_holder.avatarName != null 
+                    ? `${x2.next_holder.avatar}/${x2.next_holder.avatarName}`
+                    : null,
                   positionName: x2.next_holder.position,
                   positionNum: x2.orgChild2.orgChild2ShortName + x2.posMasterNo,
                   positionNumInt: x2.posMasterNo,
@@ -2013,7 +2029,9 @@ export class OrganizationController extends Controller {
                     .map((x3: PosMaster) => ({
                       personID: x3.next_holder.id,
                       name: x3.next_holder.firstName,
-                      avatar: x3.next_holder.avatar,
+                      avatar: x3.next_holder && x3.next_holder.avatar != null && x3.next_holder.avatarName != null 
+                        ? `${x3.next_holder.avatar}/${x3.next_holder.avatarName}`
+                        : null,
                       positionName: x3.next_holder.position,
                       positionNum: x3.orgChild3.orgChild3ShortName + x3.posMasterNo,
                       positionNumInt: x3.posMasterNo,
@@ -2024,7 +2042,9 @@ export class OrganizationController extends Controller {
                         .map((x4: PosMaster) => ({
                           personID: x4.next_holder.id,
                           name: x4.next_holder.firstName,
-                          avatar: x4.next_holder.avatar,
+                          avatar: x4.next_holder && x4.next_holder.avatar != null && x4.next_holder.avatarName != null 
+                            ? `${x4.next_holder.avatar}/${x4.next_holder.avatarName}`
+                            : null,
                           positionName: x4.next_holder.position,
                           positionNum: x4.orgChild4.orgChild4ShortName + x4.posMasterNo,
                           positionNumInt: x4.posMasterNo,