From 794c09f1473aad34f55eca2920b8549aa709a859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 2 May 2023 14:28:43 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EC=9D=BC=EA=B4=84=EA=B2=B0=EC=9E=AC=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/igActivities/fpiMgt/affairMgt.js       | 38 +++++++++----------
 .../fpiMgt/affair/affairViewModal.html        |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js
index 0565adac..642873bc 100644
--- a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js
+++ b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js
@@ -162,33 +162,33 @@ $(document).on('click', '#tableApprvBtn', function (){
   const apprvAuth = $(this).attr("data-apprvauth")
   let affairRateFlag = true;
   $.each($(".apprvTd"), function (idx, el) {
-    if (apprvAuth === "APC003" || apprvAuth === "APC004") {
-      const chkbox = $(el).find(".apprvChkbox:checked")
-      if(chkbox.length>0){
+    const chkbox = $(el).find(".apprvChkbox:checked")
+    if(chkbox.length>0){
+      if (chkbox.val() === "DST003" || chkbox.val() === "DST004") {
         const affairRating = {};
         affairRating["affairKey"] = Number($(el).find(".affairKey").val());
         affairRating["sectionApprv"] = chkbox.val();
         ratingList.push(affairRating);
-      }
-    } else {
-      const chkbox = $(el).find(".apprvChkbox:checked")
-      const selectorValue = $(el).find(".ratingSelector").val()
-      if(chkbox.length>0){
-        const affairRating = {};
-        affairRating["affairKey"] = Number($(el).find(".affairKey").val());
-        affairRating["headApprv"] = chkbox.val();
-        if(selectorValue !== ""){
-          affairRating["affairRate"] = selectorValue;
-          affairRating["organUp"] = $(el).find(".organUpChkBox").prop("checked")?"T":"F";
-        }else{
-          if(chkbox.val()==="DST006"){
-            //부장승인 & 평가 미입력.
-            affairRateFlag = false;
+      } else {
+        const selectorValue = $(el).find(".ratingSelector").val()
+        if(chkbox.length>0){
+          const affairRating = {};
+          affairRating["affairKey"] = Number($(el).find(".affairKey").val());
+          affairRating["headApprv"] = chkbox.val();
+          if(selectorValue !== ""){
+            affairRating["affairRate"] = selectorValue;
+            affairRating["organUp"] = $(el).find(".organUpChkBox").prop("checked")?"T":"F";
+          }else{
+            if(chkbox.val()==="DST006"){
+              //부장승인 & 평가 미입력.
+              affairRateFlag = false;
+            }
           }
+          ratingList.push(affairRating);
         }
-        ratingList.push(affairRating);
       }
     }
+
   })
   if(affairRateFlag){
     affairStateChange(ratingList);
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
index 62378071..b59b5056 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
@@ -134,7 +134,7 @@
                 </th:block>
               </label>
               <div class="col-11">
-                <div class="row" th:if="${rate.sectionApprv eq null}">
+                <div class="row" th:if="${rate.sectionApprv eq null and rate.headApprv eq null}">
                   <label class="col-sm-12 col-form-label col-form-label-sm text-center bg-white">결재정보가 없습니다.</label>
                 </div>
                 <div class="row  border-top-0 border-secondary" th:if="${rate.sectionApprv ne null}">