From a6f69d3e5cb11b25db06da43dfe288bdb909879f Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Tue, 27 Sep 2022 09:21:23 +0900
Subject: [PATCH] =?UTF-8?q?fix:=EC=97=94=ED=8B=B0=ED=8B=B0=20toString?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9E=91=EC=84=B1=EC=9E=90=20?=
 =?UTF-8?q?=EC=B2=AB=EB=B2=88=EC=A7=B8=EB=B2=84=EC=A0=84=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EB=94=94=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dbnt/faisp/equip/EquipController.java |  1 +
 .../com/dbnt/faisp/equip/mapper/EquipMapper.java   |  2 ++
 .../java/com/dbnt/faisp/equip/model/Equip.java     | 14 ++++++++------
 .../com/dbnt/faisp/equip/service/EquipService.java |  4 ++++
 src/main/resources/mybatisMapper/EquipMapper.xml   |  8 ++++++++
 .../templates/equip/equipModifyModal.html          |  2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/equip/EquipController.java b/src/main/java/com/dbnt/faisp/equip/EquipController.java
index 8d040ba7..b14d775f 100644
--- a/src/main/java/com/dbnt/faisp/equip/EquipController.java
+++ b/src/main/java/com/dbnt/faisp/equip/EquipController.java
@@ -98,6 +98,7 @@ public class EquipController {
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/equip/equipStatus").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
     mav.addObject("userId", loginUser.getUserId());
+    mav.addObject("wrtId", equipService.selectEquipFirstId(equip));
     mav.addObject("equInfo", equipService.selectEquipInfo(equip));
     return mav;
   }
diff --git a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java
index 7e451dce..d11e0a36 100644
--- a/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java
+++ b/src/main/java/com/dbnt/faisp/equip/mapper/EquipMapper.java
@@ -27,6 +27,8 @@ public interface EquipMapper {
 
 	Integer selectEquipLogListCnt(EquipLog equipLog);
 
+	String selectEquipFirstId(Equip equip);
+
 
 
 }
diff --git a/src/main/java/com/dbnt/faisp/equip/model/Equip.java b/src/main/java/com/dbnt/faisp/equip/model/Equip.java
index e4365868..966c0cce 100644
--- a/src/main/java/com/dbnt/faisp/equip/model/Equip.java
+++ b/src/main/java/com/dbnt/faisp/equip/model/Equip.java
@@ -83,15 +83,14 @@ public static class EquipId implements Serializable {
   private Integer versionNo;
 }
 
-
 @Override
 public String toString() {
 	return "Equip [equKey=" + equKey + ", versionNo=" + versionNo + ", mgtOrgan=" + mgtOrgan + ", equType=" + equType
-			+ ", detailType=" + detailType + ", storedYear=" + storedYear + ", mgtType=" + mgtType + ", itemQty="
-			+ itemQty + ", itemCondition=" + itemCondition + ", note=" + note + ", wrtOrgan=" + wrtOrgan + ", wrtNm="
-			+ wrtNm + ", wrtDt=" + wrtDt + ", sosok=" + sosok + ", detailSosok=" + detailSosok + ", detailName="
-			+ detailName + ", origNm=" + origNm + ", convNm=" + convNm + ", filePath=" + filePath + ", deleteFileKey="
-			+ deleteFileKey + ", deleteFileVnum=" + deleteFileVnum + "]";
+			+ ", detailType=" + detailType + ", storedYear=" + storedYear + ", itemQty=" + itemQty + ", itemCondition="
+			+ itemCondition + ", note=" + note + ", wrtOrgan=" + wrtOrgan + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt
+			+ ", sosok=" + sosok + ", detailSosok=" + detailSosok + ", detailName=" + detailName + ", origNm=" + origNm
+			+ ", convNm=" + convNm + ", filePath=" + filePath + ", deleteFileKey=" + deleteFileKey + ", deleteFileVnum="
+			+ deleteFileVnum + ", noUpdateImg=" + noUpdateImg + "]";
 }
 
 
@@ -110,6 +109,9 @@ public String toString() {
 
 
 
+
+
+
 
 
 
diff --git a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java
index de6610ae..cf229d68 100644
--- a/src/main/java/com/dbnt/faisp/equip/service/EquipService.java
+++ b/src/main/java/com/dbnt/faisp/equip/service/EquipService.java
@@ -288,6 +288,10 @@ public class EquipService {
 	public Integer selectEquipLogListCnt(EquipLog equipLog) {
 		return equipMapper.selectEquipLogListCnt(equipLog);
 	}
+
+	public String selectEquipFirstId(Equip equip) {
+		return equipMapper.selectEquipFirstId(equip);
+	}
   
 
 	
diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml
index 531c17f8..21888f62 100644
--- a/src/main/resources/mybatisMapper/EquipMapper.xml
+++ b/src/main/resources/mybatisMapper/EquipMapper.xml
@@ -398,6 +398,14 @@
 		order by el.wrt_dt desc
 	) a
   </select>
+  
+  <select id="selectEquipFirstId" resultType="String" parameterType="Equip">
+	     select wrt_nm  
+		 from equ_mgt
+		 where equ_key = #{equKey}
+		 order by version_no asc
+		 limit 1
+  </select>
 
  
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html
index cd625d07..232d5a02 100644
--- a/src/main/resources/templates/equip/equipModifyModal.html
+++ b/src/main/resources/templates/equip/equipModifyModal.html
@@ -87,7 +87,7 @@
 <div class="modal-footer justify-content-between">
   <div class="col-auto">
     <button type="button" class="btn btn-secondary" id="closeModal" data-bs-dismiss="modal">닫기</button>
-    <button type="button" class="btn btn-primary" id="updateEquip" th:if="${accessAuth eq 'ACC003'} or ${equInfo.wrtNm eq userId}">수정</button>
+    <button type="button" class="btn btn-primary" id="updateEquip" th:if="${accessAuth eq 'ACC003'} or ${wrtId eq userId}">수정</button>
   </div>
 </div>
 </html>
\ No newline at end of file