From 9b455d4a2e42c17a508403129e4536080da25145 Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Tue, 3 Jun 2025 21:44:00 +0330
Subject: [PATCH] Fix Conflict

---
 .../EmployeeAplication.cs                     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/CompanyManagment.Application/EmployeeAplication.cs b/CompanyManagment.Application/EmployeeAplication.cs
index c424497f..9b218722 100644
--- a/CompanyManagment.Application/EmployeeAplication.cs
+++ b/CompanyManagment.Application/EmployeeAplication.cs
@@ -65,20 +65,26 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
     private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
-    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository,
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context,
+        IWorkshopRepository workShopRepository,
         ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository,
         IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment,
-        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository,
+        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication,
+        IRollCallEmployeeRepository rollCallEmployeeRepository,
         ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
-        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication,
-        IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository,
-        IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
-        IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, IRollCallServiceRepository rollCallServiceRepository) : base(context)
+        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication,
+        IEmployeeDocumentsApplication employeeDocumentsApplication,
+        IEmployeeBankInformationApplication employeeBankInformationApplication,
+        ILeftWorkTempRepository leftWorkTempRepository,
+        IUidService uidService,
+        ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
+        IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository,
+        IRollCallServiceRepository rollCallServiceRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
     {
         _context = context;
         _WorkShopRepository = workShopRepository;
         _EmployeeRepository = employeeRepository;
-        this._leftWorkRepository = leftWorkRepository;
+        this._leftWorkRepository = leftWorkRepository;  
         _personnelCodeRepository = personnelCodeRepository;
         _employeeClientTempRepository = employeeClientTempRepository;
         _webHostEnvironment = webHostEnvironment;