diff --git a/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt b/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt
index 2cd303e..10a950c 100644
--- a/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt
@@ -15,5 +15,5 @@ interface ProjectRepository : AbstractRepository<Project, Long> {
 
     fun findInvoiceInfoSearchInfoById(id: Long): List<InvoiceInfoSearchInfo>
 
-    fun findFirstByIsClpProjectAndIdNotOrderByIdDesc(isClpProject: Boolean, id: Serializable?): Project?
+    fun findFirstByIsClpProjectAndIdIsNotOrderByIdDesc(isClpProject: Boolean, id: Serializable?): Project?
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
index 17c4cf9..d16ac4d 100644
--- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt
@@ -131,7 +131,7 @@ open class ProjectsService(
         val checkIsClpProject = isClpProject != null && isClpProject
         val prefix = if (checkIsClpProject) "C" else "M"
 
-        val latestProjectCode = projectRepository.findFirstByIsClpProjectAndIdNotOrderByIdDesc(checkIsClpProject, project.id)
+        val latestProjectCode = projectRepository.findFirstByIsClpProjectAndIdIsNotOrderByIdDesc(checkIsClpProject, project.id ?: -1)
 
         if (latestProjectCode != null) {
             val lastFix = latestProjectCode.code!!.split("-")[1] //C-0001 -> 0001