diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java index b3145387..499c795d 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -33,7 +33,8 @@ public class IvsgtController { mav.addObject("accessAuth", accessAuth); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); - + + boardInvestigation.setDownOrganCdList(loginUser.getDownOrganCdList()); boardInvestigation.setQueryInfo(); mav.addObject("boardInvestigationList", boardInvestigationService.selectBoardInvestigationList(boardInvestigation)); boardInvestigation.setContentCnt(boardInvestigationService.selectBoardInvestigationListCnt(boardInvestigation)); diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java index 86924985..b1e6c4ef 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java @@ -40,9 +40,7 @@ public class MajorStatusController { mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("searchParams", majorStatus); - majorStatus.setDownOrganCdList(loginUser.getDownOrganCdList()); majorStatus.setQueryInfo(); - mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus)); majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus)); majorStatus.setPaginationInfo(); diff --git a/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml b/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml index 5a4d7a29..38925f88 100644 --- a/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml +++ b/src/main/resources/mybatisMapper/BoardInvestigationMapper.xml @@ -6,6 +6,10 @@ + and a.wrt_organ in + + #{organCd} + AND ivsgt_type = #{ivsgtType} diff --git a/src/main/resources/mybatisMapper/MajorStatusMapper.xml b/src/main/resources/mybatisMapper/MajorStatusMapper.xml index bb24d6f1..4df82611 100644 --- a/src/main/resources/mybatisMapper/MajorStatusMapper.xml +++ b/src/main/resources/mybatisMapper/MajorStatusMapper.xml @@ -26,12 +26,6 @@ and a.wrt_dt <= #{endDate}::date+1 - - and a.wrt_organ in - - #{organCd} - - diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index 4c782144..b0260759 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -67,36 +67,24 @@ - - + + + - - - - - - + + - + - + + - - - - - - - - - - - +
종류순번작성일시종류 제목관서부서계급작성자작성일시첨부파일내용첨부파일