From 5bc18ea003ab547c2465df00d5e586120084de22 Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Sun, 18 Apr 2021 15:51:18 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20op=203=20?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rep_eva_self_reviewControllers.cs          | 18 +++++++++---------
 .../eva_limit_frame_groupService.cs            |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ApiControllers/rep_eva_self_reviewControllers.cs b/ApiControllers/rep_eva_self_reviewControllers.cs
index 8037307..db53aff 100644
--- a/ApiControllers/rep_eva_self_reviewControllers.cs
+++ b/ApiControllers/rep_eva_self_reviewControllers.cs
@@ -114,15 +114,15 @@ namespace TodoAPI2.Controllers
                 }
                 reader1.Close();
 
-                var data2 = GetReport02(model);
-                PdfReader reader2 = new PdfReader(data2);
-                reader2.ConsolidateNamedDestinations();
-                for (int i = 1; i <= reader2.NumberOfPages; i++)
-                {
-                    PdfImportedPage page = writer.GetImportedPage(reader2, i);
-                    writer.AddPage(page);
-                }
-                reader2.Close();
+                //var data2 = GetReport02(model);
+                //PdfReader reader2 = new PdfReader(data2);
+                //reader2.ConsolidateNamedDestinations();
+                //for (int i = 1; i <= reader2.NumberOfPages; i++)
+                //{
+                //    PdfImportedPage page = writer.GetImportedPage(reader2, i);
+                //    writer.AddPage(page);
+                //}
+                //reader2.Close();
 
                 writer.Close();
                 document.Close();
diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
index 17d2d9b..570baf6 100644
--- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
+++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
@@ -197,9 +197,9 @@ namespace TodoAPI2.Models
                 existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded;
                 existingEntity.remark = model.remark;
 
+                int j = 1;
                 foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z)
-                {
-                    int j = 1;
+                {                    
                     if (y.help_org_id.HasValue)
                     {
                         var theemp = (from q in all_all_emp where q.id == y.employee_id select q).FirstOrDefault();
@@ -207,7 +207,7 @@ namespace TodoAPI2.Models
                         var help_at = (from s in mapping_dept where s.id == thedetail.place select s).FirstOrDefault();
                         if (theemp != null && thedetail != null && help_at != null)
                         {
-                            if (model.remark != "") existingEntity.remark += "\n";
+                            if (existingEntity.remark != "") existingEntity.remark += "\n";
                             existingEntity.remark += $"{j}.ในลำดับที่ {y.order_of_data} {theemp.fullname} ตำแหน่ง{theemp.position_name} {theemp.department_name} \nมาช่วยปฏิบัติงานที่{help_at.department_name} ตั้งแต่วันที่ {MyHelper.GetDateStringForReport(thedetail.start_date)} - {MyHelper.GetDateStringForReport(thedetail.end_date)} \nตาม{thedetail.subject}";
                         }
                         j++;