Merge branch 'v2020morge' into v2020morge-graphql

performance/Performance.Services/EmployeeService.cs

@@ -573,7 +573,7 @@ public void ImpoerAprEmployees(int allotid, string path, int userid)
                         throw new PerformanceException("文件中存在“录入科室”为空的数据");
 
                     var employees = peremployeeRepository.GetEntities(w => w.AllotId == allotid);
-                    foreach (var item in entities.Where(w => !string.IsNullOrEmpty(w.PersonnelNumber) && string.IsNullOrEmpty(w.AccountingUnit)))
+                    foreach (var item in entities.Where(w => !string.IsNullOrEmpty(w.PersonnelNumber)))
                     {
                         item.AccountingUnit = employees?.FirstOrDefault(w => w.PersonnelNumber == item.PersonnelNumber)?.AccountingUnit ?? "";
                     }