diff --git a/src/main/java/geoinfo/main/community/CommunityController.java b/src/main/java/geoinfo/main/community/CommunityController.java index 84a736fe..cd257c8d 100644 --- a/src/main/java/geoinfo/main/community/CommunityController.java +++ b/src/main/java/geoinfo/main/community/CommunityController.java @@ -94,6 +94,8 @@ public class CommunityController { mv.addObject("USEREMAIL", email); mv.addObject("USERNAME", name); + mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME")); + mv.addObject("cls", request.getSession().getAttribute("CLS")); } return mv; @@ -882,6 +884,7 @@ public class CommunityController { mv.addObject("content", content); String name = (String)request.getSession().getAttribute("USERNAME"); mv.addObject("username", name); + mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME")); mv.addObject("A", "작성자"); mv.addObject("B", "비밀번호"); mv.addObject("C", "제목"); diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java index 715336cb..d05f2149 100644 --- a/src/main/java/geoinfo/main/login/LoginController.java +++ b/src/main/java/geoinfo/main/login/LoginController.java @@ -591,6 +591,8 @@ public class LoginController { } else { mv.addObject("username", request.getSession().getAttribute("USERNAME")); // 20200625 수정 mv.addObject("userid", request.getSession().getAttribute("USERID")); // 20200625 수정 + mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME")); + mv.addObject("cls", request.getSession().getAttribute("CLS")); mv.addObject("isLogin", true); } } @@ -644,6 +646,8 @@ public class LoginController { StringBuffer sql = new StringBuffer(); String virtualNo = ""; String userName = ""; + String companyName = ""; + int loginCnt = 0; String lastLoginDate = ""; @@ -755,11 +759,15 @@ public class LoginController { if (selectWebMemberIn != null) { loginSuccess = true; userName = (String) selectWebMemberIn.get("user_name"); + if( selectWebMemberIn.get("company_name") != null ) { + companyName = selectWebMemberIn.get("company_name").toString(); + } cls = selectWebMemberIn.get("cls").toString(); if (!"".equals(request.getSession()) && !request.getSession().equals(null)) { request.getSession().setAttribute("USERID", userid); request.getSession().setAttribute("USERNAME", userName); + request.getSession().setAttribute("COMPANYNAME", companyName); request.getSession().setAttribute("MASTERCODE", masterCode); request.getSession().setAttribute("CLS", cls); request.getSession().setAttribute("GOVECODE", goveCode); @@ -789,6 +797,9 @@ public class LoginController { virtualNo = (String) selectWebMemberIn.get("virtualno"); userid = selectWebMemberIn.get("userid").toString(); userName = selectWebMemberIn.get("user_name").toString(); + if( selectWebMemberIn.get("company_name") != null ) { + companyName = selectWebMemberIn.get("company_name").toString(); + } loginCnt = Integer.parseInt(selectWebMemberIn.get("login_count").toString()); // 현재시간 sysdate = selectWebMemberIn.get("sysdate2").toString(); // 마지막 로그인실패시간 +10분 날짜 @@ -805,6 +816,7 @@ public class LoginController { request.getSession().setAttribute("USERID", userid); request.getSession().setAttribute("USERNAME", userName); + request.getSession().setAttribute("COMPANYNAME", companyName); request.getSession().setAttribute("MASTERCODE", masterCode); request.getSession().setAttribute("CLS", cls); request.getSession().setAttribute("GOVECODE", goveCode); diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java index 750b4ca8..c662ec7c 100644 --- a/src/main/java/geoinfo/main/main/MainController.java +++ b/src/main/java/geoinfo/main/main/MainController.java @@ -166,6 +166,7 @@ public class MainController { // login 아래 btn 설정 html mv.addObject("isLogin", false); + mv.addObject("msg", "로그인이 필요한 시버스입니다."); }else { mv.addObject("isLogin", true); @@ -482,6 +483,7 @@ public class MainController mv.addObject("userid", request.getSession().getAttribute("USERID")); mv.addObject("username", request.getSession().getAttribute("USERNAME")); + mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME")); mv.addObject("url", url); mv.addObject("cls", request.getSession().getAttribute("CLS")); mv.addObject("eGovUrl", eGovUrl); @@ -637,6 +639,7 @@ public class MainController startDate = (String)params.get("startDate"); }else { startDate = Integer.toString(thisYear); + startDate = "2014"; } if(!"".equals(endDate) && endDate != null && !"null".equals(endDate) && !"undefined".equals(endDate)) { @@ -657,18 +660,27 @@ public class MainController String userid = ""; userid = (String)request.getSession().getAttribute("USERID"); _masterCode = (String)request.getSession().getAttribute("MASTERCODE"); + + if( userid == null ) { + mv.addObject("msg", ""); + } strUtil util = new strUtil(); try { initPageIndex(page,startDate,endDate,searchKey); // Page Numbering Map map = new HashMap(); + + + long firstRow = _pageIndex * 15; + long lastRow = (_pageIndex + 1) * 15; + map.put("startDate", startDate); map.put("endDate", endDate); map.put("searchKey", searchKey); map.put("masterCode", _masterCode); - map.put("firstRow", _pageIndex * 15); - map.put("lastRow", (_pageIndex + 1) * 15); + map.put("firstRow", firstRow); + map.put("lastRow", lastRow); List> result = mainService.selectSituTable(map); Iterator> iter = result.iterator(); @@ -1027,6 +1039,8 @@ public class MainController mv.addObject("userid", userid); mv.addObject("username", username); + mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME")); + mv.addObject("cls", request.getSession().getAttribute("CLS")); cls = mainService.selectCls(map);// 개인, 기업, 관리자 input_cnt = ""; // 입력중 @@ -1136,7 +1150,9 @@ public class MainController else { mv.addObject("userName", request.getSession().getAttribute("USERNAME")); + mv.addObject("companyName", request.getSession().getAttribute("COMPANYNAME")); mv.addObject("userId", request.getSession().getAttribute("USERID")); + mv.addObject("cls", request.getSession().getAttribute("CLS")); } int year; @@ -1199,7 +1215,9 @@ public class MainController else { mv.addObject("userName", request.getSession().getAttribute("USERNAME")); + mv.addObject("companyName", request.getSession().getAttribute("COMPANYNAME")); mv.addObject("userId", request.getSession().getAttribute("USERID")); + mv.addObject("cls", request.getSession().getAttribute("CLS")); } mv.addObject("han", "님 환영합니다"); diff --git a/src/main/java/geoinfo/regi/complete/CompleteController.java b/src/main/java/geoinfo/regi/complete/CompleteController.java index 36ae0a7a..ef102489 100644 --- a/src/main/java/geoinfo/regi/complete/CompleteController.java +++ b/src/main/java/geoinfo/regi/complete/CompleteController.java @@ -55,6 +55,8 @@ public class CompleteController { model.put("topUserId", topUserId); model.put("topTabId", topTabId); model.put("userName", userName); + model.put("cls", topCls); + model.put("companyName", request.getSession().getAttribute("COMPANYNAME")); return "web/include/includeTopInput"; } diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml index e6b0210d..89d1110d 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml @@ -161,9 +161,9 @@ = #{startDate} AND SUBSTR(TO_CHAR(END_DATE),0,4) <= #{endDate}) ]]> - + - + @@ -174,6 +174,7 @@ FROM ( SELECT AID, ROW_NUMBER() OVER (ORDER BY AID DESC) AS RNK, PNAME,HOLE_COUNT,SUM_HOLE_DEPTH,MINX,MINY,MAXX,MAXY,PCODE + FROM ( SELECT ROW_NUMBER() OVER (ORDER BY START_DATE,PNAME DESC) AS AID, PNAME,HOLE_COUNT,SUM_HOLE_DEPTH,MINX,MINY,MAXX,MAXY,PCODE @@ -184,9 +185,9 @@ = #{startDate} AND SUBSTR(TO_CHAR(END_DATE),0,4) <= #{endDate}) ]]> - + - + ) diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml index f317383b..bd701800 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml @@ -22,7 +22,8 @@ - - - + ~