From d7f0ccb6d2c7c85e5c36140cc7e1ac1f150d72cb Mon Sep 17 00:00:00 2001
From: "MSI\\2Fi" <jason.tom@2fi-solutions.com.hk>
Date: Tue, 24 Sep 2024 18:25:10 +0800
Subject: [PATCH] projectExpense sort by project code

---
 .../tsms/modules/project/entity/ProjectExpenseRepository.kt   | 2 +-
 .../tsms/modules/project/service/ProjectExpenseService.kt     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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<ProjectExpense, Long> {
-    fun findExpenseSearchInfoByDeletedFalse(): List<ProjectExpenseSearchInfo>
+    fun findExpenseSearchInfoByDeletedFalseOrderByProjectCode(): List<ProjectExpenseSearchInfo>
 
     fun findAllByProjectIdAndDeletedFalse(projectId: Long): List<ProjectExpense>
 }
\ 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<ProjectExpense, Long, ProjectExpenseRepository>(jdbcDao, projectExpenseRepository){
         open fun findProjectExpenseSearchInfo(): List<ProjectExpenseSearchInfo> {
-            return projectExpenseRepository.findExpenseSearchInfoByDeletedFalse()
+            return projectExpenseRepository.findExpenseSearchInfoByDeletedFalseOrderByProjectCode()
         }
 
         open fun createProjectExpense(projectExpenseList: List<ProjectExpenseRequest>): 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
     }