Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

src/controllers/ProfileController.ts

@@ -7202,7 +7202,7 @@ export class ProfileController extends Controller {
         : posMaster_.orgChild1.orgChild1Name,
       posMaster_ == null || posMaster_.orgRoot == null ? null : posMaster_.orgRoot.orgRootName,
     ];
-    const org = fullNameParts.filter((part) => part !== undefined && part !== null).join(" ");
+    const org = fullNameParts.filter((part) => part !== undefined && part !== null).join("\n");
 
     //find commander(ผู้บังคับบัญชา)
     let node = 4;

src/controllers/ProfileSalaryController.ts

@@ -232,7 +232,26 @@ export class ProfileSalaryController extends Controller {
       throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
     }
     const record = await this.salaryRepo.find({
-      where: { profileId: profile.id, commandCode: In(["5", "6", "7"]) },
+      where: { 
+        profileId: profile.id, 
+        // commandCode: In(["5", "6", "7"]) 
+        commandCode: In([
+          "0",
+          "9",
+          "1",
+          "2",
+          "3",
+          "4",
+          "8",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15",
+          "16",
+        ]), 
+      },
       order: { order: "ASC" },
     });
     return new HttpSuccess(record);