diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index 27b8d770..04895d9b 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -128,6 +128,20 @@ public class AdjClsMgrController { log.debug("commandMap : {}", commandMap); log.debug("commandMap.isEmpty() : {}", commandMap.isEmpty()); + //조정조사관, 조정팀장일 시 조정조사관 조회 구분 추가 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : loginVO.getUniqId().toString().trim(); + commandMap.put("searchLoginId", userId); + + if(("".equals(commandMap.get("searchEachAdrAdminYn")) || commandMap.get("searchEachAdrAdminYn") == null)&& "ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { + commandMap.put("searchEachAdrAdminYn", "Y"); + } + + if("ROLE_ADR_ADMIN".equals(loginVO.getAuthority()) && ("10".equals(loginVO.getOfcpsNm()) || "20".equals(loginVO.getOfcpsNm()))) { + commandMap.put("searchEachAdrAdminBtnYn", "Y"); + } + + //기본값설정 commandMap.put("rangeView", "kcc_adr_advc"); String searchWrd = (String) commandMap.get("q"); diff --git a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java index 2d31478b..35a69eb4 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -347,6 +347,8 @@ public class SearchServiceImpl implements InitializingBean, SearchService { String searchCondition = (String)commandMap.get("searchCondition"); String searchCondition2 = (String)commandMap.get("searchCondition2"); + String searchEachAdrAdminYn = (String)commandMap.get("searchEachAdrAdminYn"); + String searchLoginId = (String)commandMap.get("searchLoginId"); //검색조건 추가 if( !"*:*".equals(_q.toString()) && StringUtils.isEmpty(searchCondition)){ @@ -382,6 +384,10 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } + //조정조사관 조회 구분 라디오 버튼 - 담당사건만 보기 + if("Y".equals(searchEachAdrAdminYn)) { + query.addFilterQuery("adrAdmId:" + searchLoginId); + } if (StringUtils.isNotBlank(sdate) && StringUtils.isNotBlank(edate)) { query.addFilterQuery("registDt:["+sdate+" TO "+edate+"]"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp index f2def22f..5c08297d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -41,6 +41,7 @@ listForm.q.value = q1 ; listForm.searchCondition.value = form.searchCondition.value; listForm.searchCondition2.value = getCheckboxValue(); + listForm.searchEachAdrAdminYn.value = form.searchEachAdrAdminYn.value; listForm.action = ""; listForm.submit(); } @@ -94,6 +95,7 @@ <%-- " /> --%> + " /> @@ -158,6 +160,21 @@ + + style="display:none;"> + 조정조사관 조회 구분 + + + + 담당사건만 보기 + + + + 전체 보기 + + + +
조정조사관 조회 구분