diff --git a/CompanyManagment.Application/EmployeeAplication.cs b/CompanyManagment.Application/EmployeeAplication.cs
index 01040066..9cad20ec 100644
--- a/CompanyManagment.Application/EmployeeAplication.cs
+++ b/CompanyManagment.Application/EmployeeAplication.cs
@@ -37,7 +37,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -182,7 +182,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
index 0a1bdb67..e8437bbf 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
@@ -1064,6 +1064,7 @@
 				const keyCode = event.keyCode || event.which;
 				const selfGroupNo = $(this).parent().parent().parent().parent().parent().parent().children('select');
 				const selectGroupNo = selfGroupNo.attr("joblist-groupNo");
+
 				// if (keyCode != 13) {
 				//     $('.opJob').remove();
 				// } else {
@@ -1074,7 +1075,7 @@
 				const searched = $(this).val();
 
 
-				if (searched.length > 2) {
+				if (searched.length > 2 && selectGroupNo != null) {
 
 					$.ajax({
 						/* contentType: 'charset=utf-8',*/
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
index d269cecc..68c8c8aa 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
@@ -1148,7 +1148,7 @@
 				const searched = $(this).val();
 
 
-				if (searched.length > 2) {
+				if (searched.length > 2 && selectGroupNo != null) {
 
 					$.ajax({
 						/* contentType: 'charset=utf-8',*/