Merge branch 'develop' into adiDev

src/controllers/EmployeePositionController.ts

@@ -2203,24 +2203,24 @@ export class EmployeePositionController extends Controller {
     const positionOld = await this.employeePositionRepository.findOne({
       where: {
         posMasterId: posMasterOld?.id,
-        positionIsSelected: true
-      }
-    })
+        positionIsSelected: true,
+      },
+    });
     if (positionOld != null) {
-      positionOld.positionIsSelected = false
+      positionOld.positionIsSelected = false;
       await this.employeePositionRepository.save(positionOld);
     }
 
     const checkPosition = await this.employeePositionRepository.find({
       where: {
         posMasterId: body.posmasterId,
-        positionIsSelected: true
-      }
-    })
+        positionIsSelected: true,
+      },
+    });
     if (checkPosition.length > 0) {
-      const clearPosition = checkPosition.map(positions => ({
+      const clearPosition = checkPosition.map((positions) => ({
         ...positions,
-        positionIsSelected: false
+        positionIsSelected: false,
       }));
       await this.employeePositionRepository.save(clearPosition);
     }
@@ -2239,11 +2239,15 @@ export class EmployeePositionController extends Controller {
     const positionNew = await this.employeePositionRepository.findOne({
       where: {
         id: body.positionId,
-        posMasterId: body.posmasterId
-      }
-    })
-    if(positionNew != null) {
-      positionNew.positionIsSelected = true
+        posMasterId: body.posmasterId,
+      },
+    });
+    if (positionNew != null) {
+      positionNew.positionIsSelected = true;
+      profile.posLevel = positionNew.posLevel;
+      profile.posType = positionNew.posType;
+      profile.position = positionNew.positionName;
+      await this.profileRepository.save(profile);
       await this.employeePositionRepository.save(positionNew);
     }
     return new HttpSuccess();

src/controllers/PositionController.ts

@@ -3417,6 +3417,10 @@ export class PositionController extends Controller {
     });
     if (positionNew != null) {
       positionNew.positionIsSelected = true;
+      profile.posLevel = positionNew.posLevel;
+      profile.posType = positionNew.posType;
+      profile.position = positionNew.positionName;
+      await this.profileRepository.save(profile);
       await this.positionRepository.save(positionNew);
     }
     return new HttpSuccess();

src/entities/AuthRoleAttr.ts

@@ -7,45 +7,45 @@ import { AuthRole } from "./AuthRole";
 export class AuthRoleAttr extends EntityBase {
   @Column({
     nullable: true,
-    comment: "",
+    comment: "ความเป็นเจ้าของ (Ownership)",
     length: 255,
     default: null,
   })
   attrOwnership: string;
 
   @Column({
-    comment: "",
+    comment: "สิทธิ์ดำเนินการ (Permission) การ Create",
     default: false,
   })
   attrIsCreate: boolean;
 
   @Column({
-    comment: "",
+    comment: "สิทธิ์ดำเนินการ (Permission) การ List",
     default: false,
   })
   attrIsList: boolean;
 
   @Column({
-    comment: "",
+    comment: "สิทธิ์ดำเนินการ (Permission) การ Get",
     default: false,
   })
   attrIsGet: boolean;
 
   @Column({
-    comment: "",
+    comment: "สิทธิ์ดำเนินการ (Permission) การ Update",
     default: false,
   })
   attrIsUpdate: boolean;
 
   @Column({
-    comment: "",
+    comment: "สิทธิ์ดำเนินการ (Permission) การ Delete",
     default: false,
   })
   attrIsDelete: boolean;
 
   @Column({
     nullable: true,
-    comment: "",
+    comment: "สิทธิการเข้าถึง(Privilege)",
     length: 255,
     default: null,
   })