diff --git a/src/main/resources/mybatis/mapper/system/code/CodeMapper_maria.xml b/src/main/resources/mybatis/mapper/system/code/CodeMapper_maria.xml index f065caa..50ac904 100644 --- a/src/main/resources/mybatis/mapper/system/code/CodeMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/system/code/CodeMapper_maria.xml @@ -82,9 +82,7 @@ from tb_cd_detail d join tb_cd_group m on d.CD_GROUP_ID = m.CD_GROUP_ID where 1 = 1 - - and d.CD_GROUP_ID = #{selectCdGroupId} - + and d.CD_GROUP_ID = #{selectCdGroupId} and d.USE_YN = #{searchUseYn} diff --git a/src/main/webapp/WEB-INF/views/system/code/integrated/manage.jsp b/src/main/webapp/WEB-INF/views/system/code/integrated/manage.jsp index 4550113..89d4569 100644 --- a/src/main/webapp/WEB-INF/views/system/code/integrated/manage.jsp +++ b/src/main/webapp/WEB-INF/views/system/code/integrated/manage.jsp @@ -290,6 +290,9 @@ $("#masterCurrentPage").text(responseObj.data.pagination.page); $("#masterTotalPages").text(responseObj.data.pagination.totalPages); } + //하단 그리드 초기화 + CodeIntegratedManage.selectCdGroupId = ''; + CodeIntegratedManage.detailGrid.instance.readData(1); }); // 행 클릭 이벤트 @@ -887,6 +890,7 @@ // 그룹코드 검색 버튼 클릭 이벤트 $('#master_search_btn').on('click', function() { self.masterGrid.instance.readData(1); + }); // 그룹코드 perPage 변경 이벤트 @@ -905,6 +909,9 @@ $('#deleteMasterBtn').on('click', function(e) { e.preventDefault(); self.masterGrid.deleteSelectedRows(); + // 하단 그리드 초기화 + CodeIntegratedManage.selectCdGroupId = ''; + self.detailGrid.instance.readData(1); }); // 그룹코드 취소 버튼 클릭 이벤트