From 013ea2860879b454fb27fe428821a47a6f0c41cf Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Mon, 15 Jul 2019 10:44:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E7=99=BB=E9=99=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vilson <545522390@qq.com>
---
 application/common/Model/Member.php        | 4 ++--
 application/project/controller/Account.php | 4 ++--
 application/project/controller/Index.php   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/common/Model/Member.php b/application/common/Model/Member.php
index a8d6b2e..c66c20b 100644
--- a/application/common/Model/Member.php
+++ b/application/common/Model/Member.php
@@ -39,7 +39,7 @@ class Member extends CommonModel
                         $departments[] = $department['name'];
                     }
                 }
-                $item['department'] = implode(' - ', $departments);
+                $item['department'] = $departments ? implode(' - ', $departments) : '';
                 $organization = Organization::where(['code' => $item['organization_code']])->find();
                 if ($organization) {
                     $organizationList[] = $organization;
@@ -50,7 +50,7 @@ class Member extends CommonModel
         $member['is_owner'] = $list[0]['is_owner'];
         $member['authorize'] = $list[0]['authorize'];
         $member['position'] = $list[0]['position'];
-        $member['department'] = implode(' - ', $list[0]['department']);
+        $member['department'] = $list[0]['department'];
 
         setCurrentMember($member);
         !empty($member['authorize']) && NodeService::applyProjectAuthNode();
diff --git a/application/project/controller/Account.php b/application/project/controller/Account.php
index a7963db..1a314fa 100644
--- a/application/project/controller/Account.php
+++ b/application/project/controller/Account.php
@@ -87,7 +87,7 @@ class Account extends BasicApi
                         $departments[] = $department['name'];
                     }
                 }
-                $item['departments'] = implode(' - ', $departments);
+                $item['departments'] = $departments ? implode(' - ', $departments) : '';
             }
             unset($item);
         }
@@ -112,7 +112,7 @@ class Account extends BasicApi
                     $departments[] = $department['name'];
                 }
             }
-            $memberAccount['departments'] = implode(' - ', $departments);
+            $memberAccount['departments'] = $departments ? implode(' - ', $departments) : '';
         }
         $this->success('', $memberAccount);
     }
diff --git a/application/project/controller/Index.php b/application/project/controller/Index.php
index 07ab69e..afa22a6 100644
--- a/application/project/controller/Index.php
+++ b/application/project/controller/Index.php
@@ -70,7 +70,7 @@ class Index extends BasicApi
                 }
             }
             $member['position'] = $memberAccount['position'];
-            $member['department'] = implode(' - ', $departments);
+            $member['department'] = $departments ? implode(' - ', $departments) : '';
             $member['account_id'] = $memberAccount['id'];
             $member['is_owner'] = $memberAccount['is_owner'];
             $member['authorize'] = $memberAccount['authorize'];