diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs
index 9f2fffe98..e60189613 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentBLL.cs	
@@ -67,7 +67,7 @@ namespace Learun.Application.Organization
                 List<DepartmentEntity> list = GetList(companyId);
                 if (!string.IsNullOrEmpty(keyWord))
                 {
-                    list = list.FindAll(t => t.F_FullName.Contains(keyWord) || t.F_EnCode.Contains(keyWord) || t.F_ShortName.Contains(keyWord));
+                    list = list.FindAll(t => (!string.IsNullOrEmpty(t.F_FullName) && t.F_FullName.Contains(keyWord)) || (!string.IsNullOrEmpty(t.F_EnCode) && t.F_EnCode.Contains(keyWord)) || (!string.IsNullOrEmpty(t.F_ShortName) && t.F_ShortName.Contains(keyWord)));
                 }
                 return list;
             }