From ad4c3fbcd7c58b1c026d5923ceff28f24a809bca 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: Thu, 8 Dec 2022 18:22:20 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.=20=EB=A9=94=EB=89=B4?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=82=AC=EC=9A=A9=EC=97=AC=EB=B6=80=20?=
 =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=EC=8B=9C=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=20=EA=B6=8C=ED=95=9C=20=EC=82=AD=EC=A0=9C.=20?=
 =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20=EC=96=91=EC=8B=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EB=AA=A8=EB=8B=AC=EC=96=91=EC=8B=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20=EC=99=B8=EC=82=AC=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EB=AA=A9=ED=91=9C=20>=20=EC=99=B8=EC=82=AC=EC=B7=A8=EC=95=BD?=
 =?UTF-8?q?=EC=A7=80=20=EB=AA=A8=EB=8B=AC=20=EC=96=91=EC=8B=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/AccessConfigRepository.java    |   2 +-
 .../codeMgt/repository/CodeMgtRepository.java |   2 +-
 .../main/codeMgt/service/CodeMgtService.java  |   4 +-
 .../main/fipTarget/FipTargetController.java   |   1 +
 .../fipTarget/mapper/FipTargetMapper.java     |   3 +-
 .../fipTarget/service/FipTargetService.java   |   3 +-
 .../main/menuMgt/service/MenuMgtService.java  |  11 +-
 .../resources/mybatisMapper/FipTarget.xml     |  18 +--
 .../templates/faRpt/faRptEditModal.html       |   2 +-
 .../fipTarget/partInfoEditModal.html          |   2 +-
 .../fipTarget/partInfoModifyModal.html        |   2 +-
 .../fipTarget/partWorkEditModal.html          |   2 +-
 .../fipTarget/partWorkModifyModal.html        |   2 +-
 .../templates/fipTarget/vulnEditModal.html    | 142 +++++++++---------
 .../templates/fipTarget/vulnViewModal.html    |   2 +-
 .../templates/fipTarget/vulnerableList.html   |   2 +-
 .../fpiMgt/affair/affairEditModal.html        |  37 ++---
 .../fpiMgt/affairPlan/planEditModal.html      |   2 +-
 .../templates/ivsgt/ivsgtEditModal.html       |   2 +-
 .../publicBoard/board/boardEditModal.html     |   2 +-
 .../publicBoard/notice/noticeEditModal.html   |   2 +-
 .../publicBoard/qna/qnaEditModal.html         |   2 +-
 .../reference/referenceEditModal.html         |   2 +-
 .../resources/templates/sri/sriEditModal.html |   2 +-
 .../resources/templates/sri/sriViewModal.html |   2 +-
 25 files changed, 125 insertions(+), 128 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java b/src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java
index 418870bd..3f8ac1a7 100644
--- a/src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java
+++ b/src/main/java/com/dbnt/faisp/main/authMgt/repository/AccessConfigRepository.java
@@ -5,5 +5,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 
 
 public interface AccessConfigRepository extends JpaRepository<AccessConfig, AccessConfig.AccessConfigId> {
-
+  void deleteByMenuKey(Integer menuKey);
 }
diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java
index 203edcab..20efb506 100644
--- a/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java
+++ b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java
@@ -14,5 +14,5 @@ public interface CodeMgtRepository extends JpaRepository<CodeMgt, CodeMgt.CodeMg
   Optional<CodeMgt> findByCategoryCdAndItemValue(String categoryCd, String itemValue);
   List<CodeMgt> findByUseChkOrderByItemCdAsc(String useChk);
   List<CodeMgt> findByOrderByOrderNumAsc();
-  Optional<CodeMgt> findByCategoryCdOrderByItemCdDesc(String categoryCd);
+  Optional<CodeMgt> findTop1ByCategoryCdOrderByItemCdDesc(String categoryCd);
 }
diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
index 7314725c..4a9aabf5 100644
--- a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
+++ b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
@@ -39,8 +39,8 @@ public class CodeMgtService{
       HashMap<String, Integer> map = new HashMap<>();
       for(CodeMgt code: codeList){
         if(code.getItemCd().isEmpty()){
-          CodeMgt lastCode = codeMgtRepository.findByCategoryCdOrderByItemCdDesc(code.getCategoryCd()).orElse(null);
-          if(lastCode==null){
+          CodeMgt lastCode = codeMgtRepository.findTop1ByCategoryCdOrderByItemCdDesc(code.getCategoryCd()).orElse(null);
+          if(lastCode!=null){
             String lastCodeSeq = lastCode.getItemCd().replace(lastCode.getCategoryCd(), "");
             map.put(code.getCategoryCd(), Integer.parseInt(lastCodeSeq)+1);
           }else{
diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
index 02fc914e..a42c06f1 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
@@ -387,6 +387,7 @@ public class FipTargetController {
   @GetMapping("/vulnEditModal")
   public ModelAndView vulnEditModal(@AuthenticationPrincipal UserInfo loginUser,Vulnerable vulnerable) {
     ModelAndView mav = new ModelAndView("fipTarget/vulnEditModal");
+    mav.addObject("downOrganList", loginUser.getDownOrganCdList());
     vulnerable.setDownOrganCdList(loginUser.getDownOrganCdList());
     mav.addObject("organList", fipTargetService.selecetVulnOrganList(vulnerable));
     mav.addObject("userOrgan", loginUser.getOgCd());
diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java
index 6ca661c2..56ad7a29 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/mapper/FipTargetMapper.java
@@ -1,5 +1,6 @@
 package com.dbnt.faisp.main.fipTarget.mapper;
 
+import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
 import com.dbnt.faisp.main.fipTarget.model.PartInfo;
 import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;
 import com.dbnt.faisp.main.fipTarget.model.PartWork;
@@ -42,7 +43,7 @@ public interface FipTargetMapper {
 
 	PartWork selectPartWorkInfo(PartWork partWork);
 
-	List<ParamMap> selecetVulnOrganList(Vulnerable vulnerable);
+	List<CodeMgt> selecetVulnOrganList(Vulnerable vulnerable);
 
 	List<ParamMap> selectVulnerableList(Vulnerable vulnerable);
 
diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java
index ba1d7e76..06bce08b 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java
@@ -3,6 +3,7 @@ package com.dbnt.faisp.main.fipTarget.service;
 
 
 import com.dbnt.faisp.config.BaseService;
+import com.dbnt.faisp.main.codeMgt.model.CodeMgt;
 import com.dbnt.faisp.main.fipTarget.mapper.FipTargetMapper;
 import com.dbnt.faisp.main.fipTarget.model.PartInfo;
 import com.dbnt.faisp.main.fipTarget.model.PartInfo.PartInfoId;
@@ -333,7 +334,7 @@ public class FipTargetService extends BaseService {
 		return partWorkFileRepository.findById(new PartWorkFileId(fileSeq, pwSeq,piSeq)).orElse(null);
 	}
 
-	public List<ParamMap> selecetVulnOrganList(Vulnerable vulnerable) {
+	public List<CodeMgt> selecetVulnOrganList(Vulnerable vulnerable) {
 		return fipTargetMapper.selecetVulnOrganList(vulnerable);
 	}
 	
diff --git a/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java
index 84fb1f87..69bd2bb4 100644
--- a/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java
+++ b/src/main/java/com/dbnt/faisp/main/menuMgt/service/MenuMgtService.java
@@ -1,12 +1,13 @@
 package com.dbnt.faisp.main.menuMgt.service;
 
+import com.dbnt.faisp.main.authMgt.repository.AccessConfigRepository;
 import com.dbnt.faisp.main.menuMgt.mapper.MenuMgtMapper;
 import com.dbnt.faisp.main.menuMgt.model.MenuMgt;
 import com.dbnt.faisp.main.menuMgt.repository.MenuMgtRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.Transient;
 import java.util.*;
 
 @Service
@@ -14,6 +15,7 @@ import java.util.*;
 public class MenuMgtService {
 
   private final MenuMgtRepository menuMgtRepository;
+  private final AccessConfigRepository accessConfigRepository;
   private final MenuMgtMapper menuMgtMapper;
 
   public List<MenuMgt> selectMenuMgtList(MenuMgt menuMgt){
@@ -32,7 +34,7 @@ public class MenuMgtService {
   public Integer selectMenuMgtListToAccessAuthCnt(MenuMgt menuMgt){
     return menuMgtMapper.selectMenuMgtListToAccessAuthCnt(menuMgt);
   }
-  @Transient
+  @Transactional
   public String saveMenuMgt(MenuMgt menuMgt) {
     if(menuMgt.getMenuKey()==null){
       MenuMgt duplMenu = menuMgtRepository.findTopByCat1CdAndCat2CdAndCat3Cd(menuMgt.getCat1Cd(), menuMgt.getCat2Cd(), menuMgt.getCat3Cd()).orElse(null);
@@ -43,11 +45,14 @@ public class MenuMgtService {
       }
     }else{
       menuMgtRepository.save(menuMgt);
+      if(menuMgt.getUseChk()==null || !menuMgt.getUseChk().equals("T")){
+        accessConfigRepository.deleteByMenuKey(menuMgt.getMenuKey());
+      }
     }
     return "";
   }
 
-  @Transient
+  @Transactional
   public void deleteMenuMgt(List<MenuMgt> menuList) {
     menuMgtRepository.deleteAll(menuList);
   }
diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml
index 4c73632e..65d70a28 100644
--- a/src/main/resources/mybatisMapper/FipTarget.xml
+++ b/src/main/resources/mybatisMapper/FipTarget.xml
@@ -442,19 +442,19 @@
 		and pw.pi_seq = #{piSeq}		  	 		
   </select>
   
-  <select id="selecetVulnOrganList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="Vulnerable">
-	     select item_cd,
+  <select id="selecetVulnOrganList" resultType="CodeMgt" parameterType="Vulnerable">
+     select item_cd,
 		        item_value
 		 from code_mgt cm,
 		      organ_config oc
 		  where cm.item_cd = oc.organ_cd
-		  and oc.organ_type = 'OGC003'
-		  and cm.use_chk = 'T'
-		  and item_cd in
-		  <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
-      	 	#{item}
-   	      </foreach>
-     	  order by item_cd asc
+        and oc.organ_type = 'OGC003'
+        and cm.use_chk = 'T'
+        and cm.item_cd in
+          <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+              #{item}
+          </foreach>
+      order by item_cd asc
   </select>
   
   <select id="selectVulnerableList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="Vulnerable">
diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html
index b6dc094b..26e56519 100644
--- a/src/main/resources/templates/faRpt/faRptEditModal.html
+++ b/src/main/resources/templates/faRpt/faRptEditModal.html
@@ -59,7 +59,7 @@
           </div>
         </div>
         <div class="row mb-3">
-          <label for="fileInputer" class="col-sm-2 col-form-label col-form-label-sm text-center">업로드 자료</label>
+          <label for="fileInputer" class="col-sm-2 col-form-label col-form-label-sm text-center">첨부파일</label>
           <div class="col-sm-10" style="min-height: 70px;">
             <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
               <th:block th:if="${#arrays.isEmpty(faRpt.fileList)}">
diff --git a/src/main/resources/templates/fipTarget/partInfoEditModal.html b/src/main/resources/templates/fipTarget/partInfoEditModal.html
index 3ea1670b..f2595496 100644
--- a/src/main/resources/templates/fipTarget/partInfoEditModal.html
+++ b/src/main/resources/templates/fipTarget/partInfoEditModal.html
@@ -110,7 +110,7 @@
             </div>
           </div>
           <div class="row mb-3">
-	      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+	      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
 	      <div class="col-sm-10" style="min-height: 70px;">
 	        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
 	            <br>파일을 업로드 해주세요.
diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html
index 55268f5d..509d932b 100644
--- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html
+++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html
@@ -124,7 +124,7 @@
             </div>
           </div>
           <div class="row mb-3">
-	      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+	      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
 	      <div class="col-sm-10" style="min-height: 70px;">
 	        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
 	          <th:block th:if="${#strings.isEmpty(partInfo.fileList[0].origNm)}">
diff --git a/src/main/resources/templates/fipTarget/partWorkEditModal.html b/src/main/resources/templates/fipTarget/partWorkEditModal.html
index 50184688..9d3dc0b1 100644
--- a/src/main/resources/templates/fipTarget/partWorkEditModal.html
+++ b/src/main/resources/templates/fipTarget/partWorkEditModal.html
@@ -66,7 +66,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
       <div class="col-sm-10" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
             <br>파일을 업로드 해주세요.
diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html
index 8a2eab0a..84d3b97b 100644
--- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html
+++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html
@@ -63,7 +63,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
       <div class="col-sm-10" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
 	          <th:block th:if="${#arrays.isEmpty(pwInfo.fileList)}">
diff --git a/src/main/resources/templates/fipTarget/vulnEditModal.html b/src/main/resources/templates/fipTarget/vulnEditModal.html
index ff575318..4fdc5220 100644
--- a/src/main/resources/templates/fipTarget/vulnEditModal.html
+++ b/src/main/resources/templates/fipTarget/vulnEditModal.html
@@ -7,84 +7,82 @@
 </div>
 <div class="modal-body">
   <form id="saveVulnoFm" method="post">
-        <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
-   		<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-   		<input type="hidden" name="vulnKey" th:value="${info.vulnKey}">
-    	<input type="hidden" name="wrtOrgan" th:value="${info.wrtOrgan}">
-    	<input type="hidden" name="wrtPart" th:value="${info.wrtPart}">
-    	<input type="hidden" name="wrtTitle" th:value="${info.wrtTitle}">
-    	<input type="hidden" name="wrtUserSeq" th:value="${info.wrtUserSeq}">
-    	<input type="hidden" name="wrtNm" th:value="${info.wrtNm}">
-          <div class="row mb-1">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">경찰서</label>        
-            <div class="col-sm-10">
-               <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
-                  <option value="">선택</option>
-                  <th:block th:each="organList:${organList}">
-                  	<th:block th:if="${info.vulnKey eq null}">
-		              <option th:value="${organList.item_cd}" th:text="${organList.item_value}" th:selected="${organList.item_cd eq userOrgan}"></option>
-		          	</th:block>
-		          	<th:block th:unless="${info.vulnKey eq null}">
-		              <option th:value="${organList.item_cd}" th:text="${organList.item_value}" th:selected="${organList.item_cd eq info.mgtOrgan}"></option>
-		          	</th:block>
-		          </th:block>
-               </select>
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <input type="hidden" name="vulnKey" th:value="${info.vulnKey}">
+    <input type="hidden" name="wrtOrgan" th:value="${info.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${info.wrtPart}">
+    <input type="hidden" name="wrtTitle" th:value="${info.wrtTitle}">
+    <input type="hidden" name="wrtUserSeq" th:value="${info.wrtUserSeq}">
+    <input type="hidden" name="wrtNm" th:value="${info.wrtNm}">
+    <div class="row mb-1">
+      <label for="vulnNm" class="col-sm-2 col-form-label col-form-label-sm text-center">취약지명</label>
+      <div class="col-sm-10">
+        <input type="text" class="form-control form-control-sm" id="vulnNm" name="vulnNm" th:value="${info.vulnNm}" placeholder="직접입력">
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="mgtOrgan" class="col-sm-2 col-form-label col-form-label-sm text-center">관리서</label>
+      <div class="col-sm-4">
+        <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan">
+          <option value="">선택</option>
+          <!--<th:block th:each="code:${session.commonCode.get('OG')}">
+            <th:block th:if="${#lists.contains(downOrganList, code.itemCd)}">
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq info.wrtOrgan}"></option>
+            </th:block>
+          </th:block>-->
+          <th:block th:each="organ:${organList}">
+            <option th:value="${organ.itemCd}" th:text="${organ.itemValue}" th:selected="${organ.itemCd eq info.mgtOrgan}"></option>
+          </th:block>
+        </select>
+      </div>
+      <label for="vulnType" class="col-sm-2 col-form-label col-form-label-sm text-center">취약등급</label>
+      <div class="col-sm-4">
+        <select class="form-select form-select-sm" id="vulnType" name="vulnType">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('VULNT')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemValue eq info.vulnType}"></option>
+          </th:block>
+        </select>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="description" class="col-sm-2 col-form-label col-form-label-sm text-center">비고</label>
+      <div class="col-sm-10">
+        <input type="text" class="form-control form-control-sm" id="description" name="description" th:value="${info.description}">
+      </div>
+    </div>
+    <div class="row mb-3">
+      <label for="fileInputer" class="col-sm-2 col-form-label col-form-label-sm text-center">첨부파일</label>
+      <div class="col-sm-10" style="min-height: 70px;">
+        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
+          <th:block th:if="${#arrays.isEmpty(info.fileList)}">
+            <br>파일을 업로드 해주세요.
+          </th:block>
+          <th:block th:unless="${#arrays.isEmpty(info.fileList)}">
+            <div class='row-col-6' th:each="infoFile:${info.fileList}">
+              <span th:data-fileseq="${infoFile.fileSeq}" th:text="|${infoFile.origNm}.${infoFile.fileExtn} ${infoFile.fileSize}|"></span>
+              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
             </div>
-          </div>        
-          <div class="row mb-1">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">취약지명</label>
-            <div class="col-sm-10">
-                  <input type="text" class="form-control" id="vulnNm" name="vulnNm" th:value="${info.vulnNm}" placeholder="직접입력">
-            </div>
-          </div> 
-          <div class="row mb-1">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">취약등급</label>        
-            <div class="col-sm-10">
-               <select class="form-select form-select-sm" id="vulnType" name="vulnType">
-                  <option value="">선택</option>
-                  <th:block th:each="commonCode:${session.commonCode.get('VULNT')}">
-		              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemValue eq info.vulnType}"></option>
-		          </th:block>
-               </select>
-            </div>
-          </div>
-          <div class="row mb-1">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">비고</label>
-            <div class="col-sm-10">
-                  <input type="text" class="form-control" id="description" name="description" th:value="${info.description}">
-            </div>
-          </div>         
-          <div class="row mb-3">
-	      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
-	      <div class="col-sm-10" style="min-height: 70px;">
-	        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
-	          <th:block th:if="${#arrays.isEmpty(info.fileList)}">
-	            <br>파일을 업로드 해주세요.
-	          </th:block>
-	          <th:block th:unless="${#arrays.isEmpty(info.fileList)}">
-	            <div class='row-col-6' th:each="infoFile:${info.fileList}">
-	              <span th:data-fileseq="${infoFile.fileSeq}" th:text="|${infoFile.origNm}.${infoFile.fileExtn} ${infoFile.fileSize}|"></span>
-	              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
-	            </div>
-	          </th:block>
-	        </div>
-	      </div>
-	      <input type="file" class="d-none" id="fileInputer" multiple>
-    	</div>
-   </form>
+          </th:block>
+        </div>
+      </div>
+      <input type="file" class="d-none" id="fileInputer" multiple>
+    </div>
+  </form>
 </div>
 <div class="modal-footer justify-content-between bg-light">
   <div class="col-auto">
-	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
   </div>
   <div class="col-auto">
-  <th:block th:if="${info.vulnKey eq null}">
-    <button type="button" class="btn btn-primary" id="saveVuln">저장</button>
-  </th:block>
-  <th:block th:unless="${info.vulnKey eq null}">
-    <button type="button" class="btn btn-danger" id="deleteVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제</button>
-    <button type="button" class="btn btn-warning" id="updateVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
-  </th:block>
+    <th:block th:if="${info.vulnKey eq null}">
+      <button type="button" class="btn btn-primary" id="saveVuln">저장</button>
+    </th:block>
+    <th:block th:unless="${info.vulnKey eq null}">
+      <button type="button" class="btn btn-danger" id="deleteVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제</button>
+      <button type="button" class="btn btn-warning" id="updateVuln" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
+    </th:block>
   </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fipTarget/vulnViewModal.html b/src/main/resources/templates/fipTarget/vulnViewModal.html
index 23140b89..94c6f5cc 100644
--- a/src/main/resources/templates/fipTarget/vulnViewModal.html
+++ b/src/main/resources/templates/fipTarget/vulnViewModal.html
@@ -36,7 +36,7 @@
 	            </div>
 	    	</div>
 			<div class="row mb-3">
-		      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+		      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
 		      <div class="col-sm-10" style="min-height: 70px;">
 		        <div class="w-100 h-100 border border-info rounded text-center">
 		        <th:block th:if="${#arrays.isEmpty(vulnInfo.fileList)}">
diff --git a/src/main/resources/templates/fipTarget/vulnerableList.html b/src/main/resources/templates/fipTarget/vulnerableList.html
index 7e4bd580..68e53c54 100644
--- a/src/main/resources/templates/fipTarget/vulnerableList.html
+++ b/src/main/resources/templates/fipTarget/vulnerableList.html
@@ -56,7 +56,7 @@
   </main>
 
   <div class="modal fade" id="vulnEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-scrollable">
+    <div class="modal-dialog modal-dialog-scrollable">
       <div class="modal-content" id="vulnEditModalContent">
         <div class="modal-header bg-dark">
         </div>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
index f0d7fe6e..c4b8bf8d 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
@@ -14,34 +14,25 @@
     <input type="hidden" name="wrtPart" th:value="${affair.wrtPart}">
     <input type="hidden" name="wrtUserSeq" th:value="${affair.wrtUserSeq}">
     <input type="hidden" name="affairStatus" id="affairStatus" th:value="${affair.affairStatus}">
+    <input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}">
     <div class="row mb-1">
       <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" th:value="${affair.wrtUserNm}" readonly>
       </div>
-      <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
-      </div>
     </div>
-    <div class="row mb-1">
-      <label for="reportDt" class="col-sm-1 col-form-label col-form-label-sm text-center">보고일자</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="reportDt" name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
-      </div>
-      <label for="autoDelete" class="col-sm-1 col-form-label col-form-label-sm text-center">자동삭제</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="autoDelete" name="autoDelete" th:value="${affair.autoDelete}" readonly>
-      </div>
-      <label for="viewStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
-      <div class="col-sm-2">
-        <select class="form-select form-select-sm" id="viewStatus" name="viewStatus">
-          <option value="">선택</option>
-          <th:block th:each="code:${session.commonCode.get('AVS')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.viewStatus}"></option>
-          </th:block>
-        </select>
-      </div>
+    <label for="reportDt" class="col-sm-1 col-form-label col-form-label-sm text-center">보고일자</label>
+    <div class="col-sm-2">
+      <input type="text" class="form-control form-control-sm" id="reportDt" name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
+    </div>
+    <label for="viewStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
+    <div class="col-sm-2">
+      <select class="form-select form-select-sm" id="viewStatus" name="viewStatus">
+        <option value="">선택</option>
+        <th:block th:each="code:${session.commonCode.get('AVS')}">
+          <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.viewStatus}"></option>
+        </th:block>
+      </select>
     </div>
     <div class="row mb-1">
       <label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">분야1</label>
@@ -107,7 +98,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">업로드<br>자료</label>
+      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
       <div class="col-sm-11" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(affair.fileList)}">
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html
index 2e107f89..875a6c21 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html
@@ -66,7 +66,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
       <div class="col-sm-10" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(plan.fileList)}">
diff --git a/src/main/resources/templates/ivsgt/ivsgtEditModal.html b/src/main/resources/templates/ivsgt/ivsgtEditModal.html
index 344dfc71..0473f627 100644
--- a/src/main/resources/templates/ivsgt/ivsgtEditModal.html
+++ b/src/main/resources/templates/ivsgt/ivsgtEditModal.html
@@ -96,7 +96,7 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
       <div class="col-sm-11" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(boardInvestigation.fileList)}">
diff --git a/src/main/resources/templates/publicBoard/board/boardEditModal.html b/src/main/resources/templates/publicBoard/board/boardEditModal.html
index 02ed38e6..2f8d7957 100644
--- a/src/main/resources/templates/publicBoard/board/boardEditModal.html
+++ b/src/main/resources/templates/publicBoard/board/boardEditModal.html
@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
       <div class="col-sm-10" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(info.fileList)}">
diff --git a/src/main/resources/templates/publicBoard/notice/noticeEditModal.html b/src/main/resources/templates/publicBoard/notice/noticeEditModal.html
index da78cfc1..dc0ebdb0 100644
--- a/src/main/resources/templates/publicBoard/notice/noticeEditModal.html
+++ b/src/main/resources/templates/publicBoard/notice/noticeEditModal.html
@@ -48,7 +48,7 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
       <div class="col-sm-11" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(info.fileList)}">
diff --git a/src/main/resources/templates/publicBoard/qna/qnaEditModal.html b/src/main/resources/templates/publicBoard/qna/qnaEditModal.html
index b90f04bc..0452bc0e 100644
--- a/src/main/resources/templates/publicBoard/qna/qnaEditModal.html
+++ b/src/main/resources/templates/publicBoard/qna/qnaEditModal.html
@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
       <div class="col-sm-10" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(info.fileList)}">
diff --git a/src/main/resources/templates/publicBoard/reference/referenceEditModal.html b/src/main/resources/templates/publicBoard/reference/referenceEditModal.html
index f8723396..ee2f6a74 100644
--- a/src/main/resources/templates/publicBoard/reference/referenceEditModal.html
+++ b/src/main/resources/templates/publicBoard/reference/referenceEditModal.html
@@ -66,7 +66,7 @@
       </div>
     </div>
     <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
+      <label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
       <div class="col-sm-10" style="min-height: 70px;">
         <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
           <th:block th:if="${#arrays.isEmpty(info.fileList)}">
diff --git a/src/main/resources/templates/sri/sriEditModal.html b/src/main/resources/templates/sri/sriEditModal.html
index 45a97a03..71975ff7 100644
--- a/src/main/resources/templates/sri/sriEditModal.html
+++ b/src/main/resources/templates/sri/sriEditModal.html
@@ -63,7 +63,7 @@
 	        </div>
         </div>
         <div class="row mb-3">
-          <label for="fileInputer" class="col-sm-2 col-form-label col-form-label-sm text-center">업로드 자료</label>
+          <label for="fileInputer" class="col-sm-2 col-form-label col-form-label-sm text-center">첨부파일</label>
           <div class="col-sm-10" style="min-height: 70px;">
             <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
               <th:block th:if="${#arrays.isEmpty(sri.fileList)}">
diff --git a/src/main/resources/templates/sri/sriViewModal.html b/src/main/resources/templates/sri/sriViewModal.html
index a15f239d..7094f1cc 100644
--- a/src/main/resources/templates/sri/sriViewModal.html
+++ b/src/main/resources/templates/sri/sriViewModal.html
@@ -58,7 +58,7 @@
         </div>
       </div>
       <div class="row mb-3">
-        <label for="fileTable" class="col-sm-2 col-form-label col-form-label-sm text-center">업로드 자료</label>
+        <label for="fileTable" class="col-sm-2 col-form-label col-form-label-sm text-center">첨부파일</label>
         <div class="col-sm-10">
           <table class="table" id="fileTable">
             <thead>