diff --git a/src/main/java/com/ffii/tsms/modules/project/entity/ProjectExpenseRepository.kt b/src/main/java/com/ffii/tsms/modules/project/entity/ProjectExpenseRepository.kt index 0cd0987..6e03002 100644 --- a/src/main/java/com/ffii/tsms/modules/project/entity/ProjectExpenseRepository.kt +++ b/src/main/java/com/ffii/tsms/modules/project/entity/ProjectExpenseRepository.kt @@ -4,7 +4,7 @@ import com.ffii.core.support.AbstractRepository import com.ffii.tsms.modules.project.entity.projections.ProjectExpenseSearchInfo interface ProjectExpenseRepository : AbstractRepository { - fun findExpenseSearchInfoByDeletedFalse(): List + fun findExpenseSearchInfoByDeletedFalseOrderByProjectCode(): List fun findAllByProjectIdAndDeletedFalse(projectId: Long): List } \ No newline at end of file diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt index 4d87ae2..149f054 100644 --- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt +++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectExpenseService.kt @@ -19,7 +19,7 @@ open class ProjectExpenseService( private val jdbcDao: JdbcDao, ) : AbstractIdEntityService(jdbcDao, projectExpenseRepository){ open fun findProjectExpenseSearchInfo(): List { - return projectExpenseRepository.findExpenseSearchInfoByDeletedFalse() + return projectExpenseRepository.findExpenseSearchInfoByDeletedFalseOrderByProjectCode() } open fun createProjectExpense(projectExpenseList: List): Boolean { @@ -63,7 +63,7 @@ open class ProjectExpenseService( }.also { saveAndFlush(it) } - return repository.findExpenseSearchInfoByDeletedFalse().find { it.id == projectExpenseReq.id } + return repository.findExpenseSearchInfoByDeletedFalseOrderByProjectCode().find { it.id == projectExpenseReq.id } } return null }