diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
index b9532c9..26d2695 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt
@@ -178,7 +178,7 @@ open class StaffsService(
         val company = companyRepository.findById(req.companyId).orElseThrow()
         val grade = if (req.gradeId != null && req.gradeId > 0L) gradeRepository.findById(req.gradeId).orElseThrow() else null
         val team = if (req.teamId != null && req.teamId > 0L) teamRepository.findById(req.teamId).orElseThrow() else null
-        val salary = salaryRepository.findById(req.salaryId).orElseThrow()
+        val salary = salaryRepository.findBySalaryPoint(req.salaryId).orElseThrow()
         val department = departmentRepository.findById(req.departmentId).orElseThrow()
 
         staff.apply {
diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
index 863eb90..a01212c 100644
--- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
+++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
@@ -1095,11 +1095,8 @@ open class ReportService(
             keys.forEachIndexed { keyIndex, key ->
                 tempCell = sheet.getRow(rowIndex).getCell(columnIndex + keyIndex + 1)
                 when (obj[key]) {
-                    is String -> tempCell.setCellValue(obj[key] as String)
                     is Double -> tempCell.setCellValue(obj[key] as Double)
-//                    else -> tempCell.setCellValue(obj[key] as  {
-
-//                    })
+                    else -> tempCell.setCellValue(obj[key] as String )
                 }
             }
             rowIndex++