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 { - + 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 findByCategoryCdAndItemValue(String categoryCd, String itemValue); List findByUseChkOrderByItemCdAsc(String useChk); List findByOrderByOrderNumAsc(); - Optional findByCategoryCdOrderByItemCdDesc(String categoryCd); + Optional 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 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 selecetVulnOrganList(Vulnerable vulnerable); + List selecetVulnOrganList(Vulnerable vulnerable); List 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 selecetVulnOrganList(Vulnerable vulnerable) { + public List 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 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 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 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 - - #{item} - - order by item_cd asc + and oc.organ_type = 'OGC003' + and cm.use_chk = 'T' + and cm.item_cd in + + #{item} + + order by item_cd asc - - - - - - - -
- -
- + + + + + + + + +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
파일을 업로드 해주세요. +
+ +
+ + 삭제
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- -
파일을 업로드 해주세요. -
- -
- - 삭제 -
-
-
-
- -
- + +
+
+ +
+
\ 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 @@
- +
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 @@