From 8b194ecde5a2c05d4b93da799edd8b6890e0e1f5 Mon Sep 17 00:00:00 2001
From: "Welliam.Cao" <303350019@qq.com>
Date: Sun, 28 Mar 2021 13:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/account.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dao/account.py b/dao/account.py
index d682ec6c..30a98283 100644
--- a/dao/account.py
+++ b/dao/account.py
@@ -205,16 +205,17 @@ def modf_user_assets(self,request):
                 return "资产不存在"       
     
     def get_user_superior(self,user):
+        #获取直属上级以及部门上级
         dataList, uidList = [], []
         if user.superior and user.superior.id != user.id:
             uidList.append(user.superior.id)
-            dataList.append(user.superior.to_json())
-            
+            dataList.append(user.superior.to_json()) 
         for ds in user.department.values():
-            manage_user = User.objects.get(id=ds.get("manage"))
-            if manage_user.id not in uidList and manage_user.id != user.id:
-                uidList.append(manage_user.id)
-                dataList.append(manage_user.to_json()) 
+            if ds.get("manage"):
+                manage_user = User.objects.get(id=ds.get("manage"))
+                if manage_user.id not in uidList and manage_user.id != user.id:
+                    uidList.append(manage_user.id)
+                    dataList.append(manage_user.to_json()) 
         return dataList