diff --git a/WebContent/jsp/common/acl/monitoringCode/monitoringCodeMan.jsp b/WebContent/jsp/common/acl/monitoringCode/monitoringCodeMan.jsp index b737ac0..6aa20ef 100644 --- a/WebContent/jsp/common/acl/monitoringCode/monitoringCodeMan.jsp +++ b/WebContent/jsp/common/acl/monitoringCode/monitoringCodeMan.jsp @@ -345,8 +345,7 @@ var postData = $('#ajaxFormTree').serializeArray(); postData.push({ name: "cmd" , value:"UPDATE"}); - postData.push({ name: "seq" , value:0}); - + $.ajax({ type : "POST", url:url, @@ -532,10 +531,10 @@ , 'USEYNNAME' ], colModel:[{ name : 'CODEGROUP' , hidden:true ,sortable:false } - , { name : 'CODE' , align:'left', key:true, width: "30%" } - , { name : 'CODENAME' , align:'left', width: "60%" } + , { name : 'CODE' , align:'left', key:true, width: "25%" } + , { name : 'CODENAME' , align:'left', width: "45%" } , { name : 'USEYNNAME' , align:'center', width: "10%" } - , { name : 'SEQ' , hidden:true } + , { name : 'SEQ' , align:'center', width: "20%" } , { name : 'PARENTCODE' , hidden:true } , { name : 'USEYN' , hidden:true } ], @@ -753,33 +752,12 @@ - <%-- + <%= localeMessage.getString("code.order") %> - + - --%> + diff --git a/WebContent/jsp/common/acl/monitoringCode/monitoringCodeManPopup.jsp b/WebContent/jsp/common/acl/monitoringCode/monitoringCodeManPopup.jsp index 4d445f8..c0300a7 100644 --- a/WebContent/jsp/common/acl/monitoringCode/monitoringCodeManPopup.jsp +++ b/WebContent/jsp/common/acl/monitoringCode/monitoringCodeManPopup.jsp @@ -57,7 +57,7 @@ $("input[name=level]").val(level); $("input[name=codeGroup]").val(codeGroup); $("select[name=useYn]").val('N'); - $("select[name=SEQ]").val("1"); + $("input[name=seq]").val(seq ? seq : 1); /* level 값으로 코드그룹 입력 제어. */ if(level == 0) @@ -89,8 +89,7 @@ var postData = $('#ajaxForm').serializeArray(); postData.push({ name: "cmd" , value:"INSERT"}); - postData.push({ name: "seq" , value:0}); - $.ajax({ +$.ajax({ type : "POST", url:url, data:postData, @@ -152,35 +151,10 @@ - <%-- + <%= localeMessage.getString("code.order") %> - -
- -
- - --%> + + diff --git a/src/main/java/com/eactive/eai/rms/common/acl/monitoringCode/MonitoringCodeManService.java b/src/main/java/com/eactive/eai/rms/common/acl/monitoringCode/MonitoringCodeManService.java index bcc9aa9..495bf63 100644 --- a/src/main/java/com/eactive/eai/rms/common/acl/monitoringCode/MonitoringCodeManService.java +++ b/src/main/java/com/eactive/eai/rms/common/acl/monitoringCode/MonitoringCodeManService.java @@ -48,7 +48,7 @@ public class MonitoringCodeManService extends BaseService { if (group.getCodeGroup().equals(search.getSearchCodeGroup())) { codeTreeList.add(createRootCodeUI(group)); } - List codeList = monitoringCodeService.findByIdCodegroup(group.getCodeGroup(), "id.code"); + List codeList = monitoringCodeService.findByIdCodegroup(group.getCodeGroup(), "seq"); codeTreeList.addAll(codeList.stream() .filter(code -> isCodeMatched(code, search)) .map(code -> createCodeUI(code, 1)).collect(Collectors.toList()));