Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

src/controllers/PermissionController.ts

@@ -192,21 +192,21 @@ export class PermissionController extends Controller {
   /**
    * API permission (dotnet api)
    * @summary permission (dotnet api)
-   * @param {string} method  Method
+   * @param {string} action  action
    * @param {string} system  authSysId
    */
-  @Get("dotnet/{method}/{system}")
+  @Get("dotnet/{action}/{system}")
   public async dotnet(
     @Request() req: RequestWithUser, 
-    @Path() method: string,
+    @Path() action: string,
     @Path() system: string
   ) {
 
-    if(!["CREATE", "DELETE", "GET", "LIST", "UPDATE"].includes(method)) {
+    if(!["CREATE", "DELETE", "GET", "LIST", "UPDATE"].includes(action)) {
-      throw new HttpError(HttpStatus.NOT_FOUND, "Method ไม่ถูกต้อง"); 
+      throw new HttpError(HttpStatus.NOT_FOUND, "Action ไม่ถูกต้อง"); 
     }
 
-    let res = await new permission().Permission(req, system.toLocaleUpperCase(), method);
+    let res = await new permission().Permission(req, system.toLocaleUpperCase(), action);
     return new HttpSuccess(res);
   }
 }

src/controllers/ProfileController.ts

@@ -2559,13 +2559,15 @@ export class ProfileController extends Controller {
   async listProfile(
     @Query("page") page: number = 1,
     @Query("pageSize") pageSize: number = 10,
-    @Query() searchField?: "firstName" | "lastName" | "fullName" | "citizenId" | "position",
+    @Query() searchField?: "firstName" | "lastName" | "fullName" | "citizenId" | "position" | "posNo",
     @Query() searchKeyword: string = "",
     @Query() posType?: string,
     @Query() posLevel?: string,
     @Query() yearLeave?: number,
     @Query() isProbation?: boolean,
     @Query() isRetire?: boolean,
+    @Query() node?: number,
+    @Query() nodeId?: string,
   ) {
     let queryLike =
       "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
@@ -2573,6 +2575,27 @@ export class ProfileController extends Controller {
       queryLike = "profile.citizenId LIKE :keyword";
     } else if (searchField == "position") {
       queryLike = "profile.position LIKE :keyword";
+    } else if (searchField == "posNo") {
+      queryLike = `CONCAT(
+        IFNULL(orgChild4.orgChild4ShortName, ''),
+        IFNULL(orgChild3.orgChild3ShortName, ''),
+        IFNULL(orgChild2.orgChild2ShortName, ''),
+        IFNULL(orgChild1.orgChild1ShortName, ''),
+        IFNULL(orgRoot.orgRootShortName, ''),
+        IFNULL(current_holders.posMasterNo , '')
+      ) LIKE :keyword`;
+    }
+    let nodeCondition = "1=1";
+    if (node === 0 && nodeId) {
+      nodeCondition = "current_holders.orgRootId = :nodeId";
+    } else if (node === 1 && nodeId) {
+      nodeCondition = "current_holders.orgChild1Id = :nodeId";
+    } else if (node === 2 && nodeId) {
+      nodeCondition = "current_holders.orgChild2Id = :nodeId";
+    } else if (node === 3 && nodeId) {
+      nodeCondition = "current_holders.orgChild3Id = :nodeId";
+    } else if (node === 4 && nodeId) {
+      nodeCondition = "current_holders.orgChild4Id = :nodeId";
     }
     const [record, total] = await this.profileRepo
       .createQueryBuilder("profile")
@@ -2622,9 +2645,13 @@ export class ProfileController extends Controller {
           keyword: `%${searchKeyword}%`,
         },
       )
+      .andWhere(nodeCondition, {
+        nodeId: nodeId,
+      }) 
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();
+    
     const findRevision = await this.orgRevisionRepo.findOne({
       where: { orgRevisionIsCurrent: true },
     });
@@ -4221,7 +4248,8 @@ export class ProfileController extends Controller {
       keyword?: string;
     },
   ) {
-    const [firstName, lastName] = body.keyword ? body.keyword.split(" ") : ["", ""];
+    let conditionFullName =
+      "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
     const [findProfile, total] = await AppDataSource.getRepository(Profile)
       .createQueryBuilder("profile")
       .leftJoinAndSelect("profile.posLevel", "posLevel")
@@ -4253,16 +4281,9 @@ export class ProfileController extends Controller {
       .orWhere(`posType.posTypeName LIKE :keyword`, {
         keyword: `%${body.keyword}%`,
       })
-      .orWhere(
+      .orWhere(conditionFullName, {
-        new Brackets((qb) => {
+        keyword: `%${body.keyword}%`,
-          if (body.keyword) {
+      })
-            qb.where(`profile.firstName LIKE :firstName`, { firstName: `%${firstName}%` }).orWhere(
-              `profile.lastName LIKE :lastName`,
-              { lastName: `%${lastName}%` },
-            );
-          }
-        }),
-      )
       .orderBy("profile.citizenId", "ASC")
       .skip((body.page - 1) * body.pageSize)
       .take(body.pageSize)