From 58fe176715b2027f783a2dae98e1583beaf34c8c Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 16 Jun 2026 15:05:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=EC=88=9C=EC=84=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/onl/admin/service/stdDefaultMan.jsp | 14 ++++++++------ .../ExtendedColumnDefinitionService.java | 9 ++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp b/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp index afa60f5..f9d8d57 100644 --- a/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp +++ b/WebContent/jsp/onl/admin/service/stdDefaultMan.jsp @@ -44,14 +44,16 @@ '<%=localeMessage.getString("stdDefaultMan.columDesc")%>', '<%=localeMessage.getString("stdDefaultMan.columLen")%>', '<%=localeMessage.getString("stdDefaultMan.keyOr")%>', - '<%=localeMessage.getString("stdDefaultMan.ifOr")%>' + '<%=localeMessage.getString("stdDefaultMan.ifOr")%>', + '<%=localeMessage.getString("stdDefaultMan.orderSeq")%>' ], colModel:[ - { name : 'COLUMNNAME' , align:'left' , sortable:false }, - { name : 'COLUMNDESC' , align:'left' }, - { name : 'COLUMNLENGTH' , align:'right' }, - { name : 'ISKEY' , align:'center' }, - { name : 'ISINTERFACE' , align:'center' } + { name : 'COLUMNNAME' , align:'left' , width: '200px', sortable:false }, + { name : 'COLUMNDESC' , align:'left' , width: '200px' }, + { name : 'COLUMNLENGTH' , align:'center' , width: '100px' }, + { name : 'ISKEY' , align:'center', width: '100px' }, + { name : 'ISINTERFACE' , align:'center', width: '100px' }, + { name : 'ORDERSEQ' , align:'center', width: '100px' } ], jsonReader: { repeatitems:false diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java index 5567d62..2b44c59 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/stdmessage/ExtendedColumnDefinitionService.java @@ -5,7 +5,9 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,7 +44,12 @@ public class ExtendedColumnDefinitionService predicate = predicate.and(qExtendedColumnDefinition.columnDesc.containsIgnoreCase(searchColumnDesc)); } - return repository.findAll(predicate, pageable); + Pageable orderedPageable = PageRequest.of( + pageable.getPageNumber(), + pageable.getPageSize(), + Sort.by(Sort.Order.asc("orderSeq"), Sort.Order.asc("columnName"))); + + return repository.findAll(predicate, orderedPageable); } }