From aec9366f858d3b2c3c52f40c4fa55afbec14257c Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Fri, 14 Jul 2023 16:38:05 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=A1=B0=EC=A0=95=EC=A2=85=EA=B2=B0?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=20=EC=A1=B0=EC=A0=95=EC=A1=B0?=
 =?UTF-8?q?=EC=82=AC=EA=B4=80=20=EC=A1=B0=ED=9A=8C=20=EA=B5=AC=EB=B6=84=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adjclsmgr/web/AdjClsMgrController.java      | 14 ++++++++++++++
 .../let/solr/search/impl/SearchServiceImpl.java |  6 ++++++
 .../jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp  | 17 +++++++++++++++++
 3 files changed, 37 insertions(+)

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 = "<c:url value='/kccadr/adjclsmgr/adjCloseMangeList.do'/>";
         listForm.submit();
     }
@@ -94,6 +95,7 @@
 	<%-- <input type="hidden" name="searchStatus" value="<c:out value="${adjClsMgrVO.searchStatus}" />" /> --%>
 	<input type="hidden" name="adrSeq" value="" />
 	<input type="hidden" name="adrSn" value="" />
+	<input type="hidden" name="searchEachAdrAdminYn" value="<c:out value="${commandMap.searchEachAdrAdminYn}" />"  />
 </form>
 <form:form id="form" name="form" commandName="adjClsMgrVO" onsubmit="return false;" method="post">
 <!-- cont -->
@@ -158,6 +160,21 @@
                                     </span>
                                 </div>
 							</li>
+							
+                            <li  <c:if test="${commandMap.searchEachAdrAdminBtnYn ne 'Y' }">style="display:none;"</c:if>>
+                                <p class="tit_text">조정조사관 조회 구분</p>
+                                <div class="radio_wrap">
+                                    <span>
+                                        <input ${commandMap.searchEachAdrAdminYn eq 'Y' ? 'checked=\"checked\"' : ''} value="Y" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn1">
+                                        <label for="searchEachAdrAdminYn1">담당사건만 보기</label>
+                                    </span>
+                                    <span>
+                                        <input ${commandMap.searchEachAdrAdminYn eq 'N' ? 'checked=\"checked\"' : ''} value="N" type="radio" name="searchEachAdrAdminYn" id="searchEachAdrAdminYn2">
+                                        <label for="searchEachAdrAdminYn2">전체 보기</label>
+                                    </span>
+                                </div>
+                            </li>
+                            
 						</ul>
                     </div>
                 </div>