diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java index 5334c35f..a8589195 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java @@ -38,7 +38,7 @@ public class FaRptController { } mav.addObject("searchUrl", "/faRpt/faRptBoard"); String accessAuth = authMgtService.selectAccessConfigList - (loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth(); + (loginUser.getUserSeq(), "/faRpt/faRptBoard").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); if(faRptBoard.getActiveTab().equals("send")){ diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java index 8c8fcc12..b2a27e9a 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java @@ -110,7 +110,7 @@ public class SriController { @GetMapping("/sriViewModal") public ModelAndView faRptViewModal(@AuthenticationPrincipal UserInfo loginUser, Sri sri){ ModelAndView mav = new ModelAndView("sri/sriViewModal"); - mav.addObject("FaSri", sriService.selectFaSriBoard(sri.getFaSriKey(), loginUser.getUserSeq())); + mav.addObject("faSri", sriService.selectFaSriBoard(sri.getFaSriKey(), loginUser.getUserSeq())); mav.addObject("userSeq",loginUser.getUserSeq()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java index f9bc2faf..42f2e30b 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java @@ -68,19 +68,19 @@ public class SriService extends BaseService { @Transactional public Sri selectFaSriBoard(Integer faSriKey, Integer userSeq) { Sri sri = sriRepository.findById(faSriKey).orElse(null); - if(sri != null){ - sri.setFileList(sriFileRepository.findByFaSriKey(faSriKey)); - sri.setReadUserList(sriReadUserRepository.findByFaSriKey(faSriKey)); - if(sri.getStatus().equals("DST007")){ - for(SriReadUser readUser: sri.getReadUserList()){ - if(readUser.getUserSeq().equals(userSeq)){ - readUser.setReadYn("T"); - sriReadUserRepository.save(readUser); - } - } - } - } - return sri; + if(sri != null){ + sri.setFileList(sriFileRepository.findByFaSriKey(faSriKey)); + sri.setReadUserList(sriReadUserRepository.findByFaSriKey(faSriKey)); + if(sri.getStatus().equals("DST007")){ + for(SriReadUser readUser: sri.getReadUserList()){ + if(readUser.getUserSeq().equals(userSeq)){ + readUser.setReadYn("T"); + sriReadUserRepository.save(readUser); + } + } + } + } + return sri; } diff --git a/src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js b/src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js index c37e1f1e..87cfa40f 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js @@ -29,15 +29,7 @@ function getSriEditModal(faSriKey){ language: "ko", autoclose: true }); - CrossEditor = new NamoSE('editor'); - CrossEditor.params.ParentEditor = document.getElementById("editor"); - CrossEditor.params.Width = "100%"; - CrossEditor.params.UserLang = "auto"; - CrossEditor.params.NewToolbar = true; - CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg"; - CrossEditor.params.FullScreen = false; - $("#editor").show(); - CrossEditor.EditorStart(); + setEditor('editor', '500'); setUploadDiv(); $("#sriEditModal").modal('show'); }, diff --git a/src/main/resources/templates/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html index fefd6521..dd767632 100644 --- a/src/main/resources/templates/sri/sriBoard.html +++ b/src/main/resources/templates/sri/sriBoard.html @@ -78,7 +78,6 @@