코드관리 오류 수정.

메뉴관리 사용여부 상태 변경시 메뉴 권한 삭제.
견문관리 양식 변경.
외사수사관리 모달양식 변경.
외사대상목표 > 외사취약지 모달 양식 변경.

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);
 }

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);
 }

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);
+          CodeMgt lastCode = codeMgtRepository.findTop1ByCategoryCdOrderByItemCdDesc(code.getCategoryCd()).orElse(null);
-          if(lastCode==null){
+          if(lastCode!=null){
             String lastCodeSeq = lastCode.getItemCd().replace(lastCode.getCategoryCd(), "");
             map.put(code.getCategoryCd(), Integer.parseInt(lastCodeSeq)+1);
           }else{

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());

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);
 

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);
 	}
 	

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);
   }

src/main/resources/mybatisMapper/FipTarget.xml

@@ -442,7 +442,7 @@
 		and pw.pi_seq = #{piSeq}		  	 		
   </select>
   
-  <select id="selecetVulnOrganList" resultType="com.dbnt.faisp.util.ParamMap" parameterType="Vulnerable">
+  <select id="selecetVulnOrganList" resultType="CodeMgt" parameterType="Vulnerable">
      select item_cd,
 		        item_value
 		 from code_mgt cm,
@@ -450,7 +450,7 @@
 		  where cm.item_cd = oc.organ_cd
         and oc.organ_type = 'OGC003'
         and cm.use_chk = 'T'
-		  and item_cd in
+        and cm.item_cd in
           <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
               #{item}
           </foreach>

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)}">

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>파일을 업로드 해주세요.

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)}">

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>파일을 업로드 해주세요.

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)}">

src/main/resources/templates/fipTarget/vulnEditModal.html

@@ -16,30 +16,28 @@
     <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>        
+      <label for="vulnNm" class="col-sm-2 col-form-label col-form-label-sm text-center">취약지명</label>
       <div class="col-sm-10">
-               <select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
+        <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="organList:${organList}">
+          <!--<th:block th:each="code:${session.commonCode.get('OG')}">
-                  	<th:block th:if="${info.vulnKey eq null}">
+            <th:block th:if="${#lists.contains(downOrganList, code.itemCd)}">
-		              <option th:value="${organList.item_cd}" th:text="${organList.item_value}" th:selected="${organList.item_cd eq userOrgan}"></option>
+              <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq info.wrtOrgan}"></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>-->
+          <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>
-          </div>        
+      <label for="vulnType" class="col-sm-2 col-form-label col-form-label-sm text-center">취약등급</label>
-          <div class="row mb-1">
+      <div class="col-sm-4">
-            <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')}">
@@ -49,13 +47,13 @@
       </div>
     </div>
     <div class="row mb-1">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">비고</label>
+      <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" id="description" name="description" th:value="${info.description}">
+        <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 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(info.fileList)}">

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)}">

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>

src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html

@@ -14,25 +14,17 @@
     <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">
@@ -42,7 +34,6 @@
         </th:block>
       </select>
     </div>
-    </div>
     <div class="row mb-1">
       <label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">분야1</label>
       <div class="col-sm-2">
@@ -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)}">

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)}">

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)}">

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)}">

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)}">

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)}">

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)}">

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)}">

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>