+ */
+/**
+ * @author User
+ *
+ */
+/**
+ * @author User
+ *
+ */
+@Controller
+public class UserContNavController {
+
+ /** EgovProgrmManageService */
+ @Resource(name = "progrmManageService")
+ private EgovProgrmManageService progrmManageService;
+
+ /** EgovMenuManageService */
+ @Resource(name = "meunManageService")
+ private EgovMenuManageService menuManageService;
+
+ /**
+ * 관리자 cont nav 를 생성한다.
+ *
+ * @param fileVO
+ * @param atchFileId
+ * @param sessionVO
+ * @param model
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping("/cmm/navi/adminContNav.do")
+ public String selectImageFileInfs(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception {
+
+ //step1.url의 메뉴 코드를 가져온다.
+ String tempUrl = (String) commandMap.get("url");
+ ComDefaultVO searchVO = new ComDefaultVO();
+ searchVO.setSearchKeyword(tempUrl);
+ ProgrmManageVO progrmManageVO = progrmManageService.selectProgrmUrl(searchVO);
+
+ //결과값을 저장하는 list
+ List result = new ArrayList();
+
+ if (progrmManageVO == null) {
+
+ }else {
+ //step2.해당 메뉴 정보를 가져온다.
+ //list에 담는다.
+ MenuManageVO tempMenuManageVO = new MenuManageVO();
+ tempMenuManageVO.setSearchKeyword(progrmManageVO.getProgrmFileNm());
+ MenuManageVO resultVO = menuManageService.selectMenuManage(tempMenuManageVO) ;
+
+ if (resultVO != null) {
+ //loop
+ //step3.상위가 0 보다 크면 상위 메뉴 정보를 가져온다.
+ //list에 담는다.do{
+ ProgrmManageVO tprogrmManageVO = new ProgrmManageVO();
+ tprogrmManageVO.setProgrmFileNm(resultVO.getMenuNm());
+ result.add(tprogrmManageVO);
+
+ while(resultVO.getMenuNo()>0) {
+ tempMenuManageVO.setSearchKeyword(Integer.toString(resultVO.getUpperMenuId()));
+ resultVO = menuManageService.selectMenuManage(tempMenuManageVO) ;
+
+ if (resultVO.getMenuNo()>0) {
+ ProgrmManageVO ttprogrmManageVO = new ProgrmManageVO();
+ ttprogrmManageVO.setProgrmFileNm(resultVO.getMenuNm());
+ result.add(ttprogrmManageVO);
+ }
+
+ }
+ //step4.상위가 0 이면 리스트를 넘긴다.
+
+ }
+
+ }
+
+ //수동 이름을 표시한다.
+ String name1 = (String) commandMap.get("name1");
+ String name2 = (String) commandMap.get("name2");
+ String name3 = (String) commandMap.get("name3");
+
+ if (!"".equals(name1)) {
+ ProgrmManageVO ttprogrmManageVO = new ProgrmManageVO();
+ ttprogrmManageVO.setProgrmFileNm(name1);
+ result.add(0, ttprogrmManageVO);
+ }
+
+ if (!"".equals(name2)) {
+ ProgrmManageVO ttprogrmManageVO = new ProgrmManageVO();
+ ttprogrmManageVO.setProgrmFileNm(name2);
+ result.add(0, ttprogrmManageVO);
+ }
+
+ if (!"".equals(name3)) {
+ ProgrmManageVO ttprogrmManageVO = new ProgrmManageVO();
+ ttprogrmManageVO.setProgrmFileNm(name3);
+ result.add(0, ttprogrmManageVO);
+ }
+
+ Collections.reverse(result);
+
+ model.addAttribute("fileList", result);
+
+ System.out.println("result.size()");
+ System.out.println(result.size());
+ System.out.println(result.size());
+ System.out.println(result.size());
+
+ return "cmm/navi/adminContNav";
+ }
+}
diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java
index 6ad61672..5657a216 100644
--- a/src/main/java/kcc/web/MainController.java
+++ b/src/main/java/kcc/web/MainController.java
@@ -386,7 +386,6 @@ public class MainController {
public String siteMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{
//메인이미지
try {
- System.out.println("aaaaaaaaaaaaaaaaaaaaaa");
String referer = (String)request.getHeader("REFERER");
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
@@ -409,18 +408,16 @@ public class MainController {
mainzoneVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
mainzoneVO.setUseYn("Y"); //사용하는것만
mainzoneVO.setDeviceType("P"); //PC
+
+ //디자인이 슬라이드가 아닌 한개의 메인화면으로 변경되어 수정
+ mainzoneVO.setRecordCountPerPage(1);
List> mainzoneList = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지
- mainzoneVO.setDeviceType("M"); //모바일
- List> mainzoneListM = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지
+// mainzoneVO.setDeviceType("M"); //모바일
+// List> mainzoneListM = egovPopupManageService.selectMainzoneList(mainzoneVO); //상단메인 이미지
model.addAttribute("mainzoneList", mainzoneList); //PC
- model.addAttribute("mainzoneListM", mainzoneListM); //모바일
+// model.addAttribute("mainzoneListM", mainzoneListM); //모바일
- /*
- * 반응형으로 사용을 해야해서 모바일에서도 팝업 존 영역의 데이터를 불러와야해서 주석처리했음
- * 우영두
- * 2021.10.29
- * */
/** 팝업 알림창괸리 */
//if(!isMobile(request)){ //PC인경우만
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Postgresql.xml
index e0f3a2bc..37c92867 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Postgresql.xml
@@ -731,7 +731,7 @@
WHERE 1=1
ORDER BY SORT1
) B
- SET A.MAZ_ID = B.MAZ_ID
+ WHERE A.MAZ_ID = B.MAZ_ID
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 70d9d44a..1f2c4199 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -16,18 +16,18 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
${fileList[fn:length(fileList)-1].progrmFileNm}
+
+
+
+
+
+
${fileVO.progrmFileNm}
+
+
+
+
${fileVO.progrmFileNm}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngList.jsp
index 1c1d8cc8..4f5796d1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngList.jsp
@@ -208,6 +208,18 @@