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); } }