diff --git a/src/main/java/cokr/xit/fims/MainController.java b/src/main/java/cokr/xit/fims/MainController.java index b312252f..8024cd79 100644 --- a/src/main/java/cokr/xit/fims/MainController.java +++ b/src/main/java/cokr/xit/fims/MainController.java @@ -68,6 +68,14 @@ public class MainController extends AbstractController { .addObject("duplicate", user != null); } + @RequestMapping(name="기관 목록", value="/error/instList.do") + public ModelAndView instList(String account, String institute) { + List instList = factionMapper.selectAllInstList(); + return new ModelAndView("jsonView") + .addObject("instList", instList); + } + + @GetMapping(name="홈", value={"/", "/index.do"}) public ModelAndView mainPage() { return new ModelAndView("index"); diff --git a/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java b/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java index 3bf299bf..e8ff22a0 100644 --- a/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java +++ b/src/main/java/cokr/xit/fims/cmmn/dao/FactionMapper.java @@ -39,4 +39,10 @@ public interface FactionMapper extends AbstractMapper { * @return 시군구코드,시군구명,기관코드,기관명,부서코드,부서명 */ DataObject selectFactionInfoOfUser(String userId); + + /**모든 기관 목록을 반환한다.
+ * @param + * @return 기관 목록 + */ + List selectAllInstList(); } diff --git a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml index d9f43fbf..66a5c64b 100644 --- a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml @@ -57,9 +57,6 @@ LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD) - - - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 9d23ceb7..b6c07dda 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -54,9 +54,6 @@
@@ -90,15 +87,13 @@