From 4dac63992aaba8c51e2dfb943c4ce8af2c9fd99b Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Fri, 14 Jun 2024 18:02:03 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=20=EC=A0=80=EC=9E=A5=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

---
 .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp  | 19 +++++++++++++------
 .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp  | 14 ++++++++++----
 .../resources/js/fims/cmmn/fims-cmmnUtil.js   | 10 +++++++++-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
index cdd082fe..50754a79 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
@@ -694,8 +694,10 @@ $(document).ready(function(){
 	    		return;
 	    	}
 
-			var cellDefs = getCellDefs($("#photoInspection_Table_0--${pageName} thead th").not(".dummy-th").not(":eq(0)"),
-	    			$($("#photoInspectionRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"));
+			var cellDefs = getCellDefs(
+				$("#photoInspection_Table_0--${pageName} thead th").not(".dummy-th").not(":eq(0)"),
+    			$($("#photoInspectionRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")
+			);
 			$P.photoInspectionControl.query.cellDefs = cellDefs;
 
 	    	$P.photoInspectionControl.download();
@@ -712,15 +714,20 @@ $(document).ready(function(){
 			
 	    	if(excelTarget == "main"){
 
-				var cellDefs = getCellDefs($("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th"),
-		    			$($("#sameVehicleInspectionMainRow--${pageName}")[0].content).find("td").not(".dummy-td"));
+				var cellDefs = getCellDefs(
+					$("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th"),
+		    		$($("#sameVehicleInspectionMainRow--${pageName}")[0].content).find("td").not(".dummy-td")
+		    	);
 				$P.sameVehicleMainControl.query.cellDefs = cellDefs;
 
 		    	$P.sameVehicleMainControl.download();
 			} else if(excelTarget == "sub"){
 
-				var cellDefs = getCellDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th"),
-		    			$($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td"));
+				var cellDefs = getCellDefs(
+					$("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th"),
+	    			$($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td"),
+	    			getCellDefsForPrivacyCell
+		    	);
 				$P.sameVehicleSubControl.query.cellDefs = cellDefs;
 
 				$P.sameVehicleSubControl.download();
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
index 5419bcaf..e146217e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
@@ -253,8 +253,11 @@ $(document).ready(function() {
 				return;
 			}
 			
-			cellDefs = getCellDefs($("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"),
-					$($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"));
+			cellDefs = getCellDefs(
+				$("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"),
+				$($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"),
+				getCellDefsForPrivacyCell
+			);
 			
 			$P.integrationSearchControl.query.gridType = "up";
 		} else {
@@ -263,8 +266,11 @@ $(document).ready(function() {
 				return;
 			}
 			
-			cellDefs = getCellDefs($("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), 
-					$($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"));
+			cellDefs = getCellDefs(
+				$("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), 
+				$($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)"),
+				getCellDefsForPrivacyCell
+			);
 			
 			$P.integrationSearchControl.query.gridType = "down";
 		}
diff --git a/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js b/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js
index 9481bff0..b0a001c0 100644
--- a/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js
+++ b/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js
@@ -362,4 +362,12 @@ const GRID = {
 			return count;
 		}
 	}
-};
\ No newline at end of file
+};
+
+function getCellDefsForPrivacyCell($td_i){
+	if($td_i.hasClass("privacy-cell")){
+		return $td_i.find("span:eq(0)").text();
+	} else {
+		return $td_i.text();	
+	}
+}
\ No newline at end of file