fix OrgController

src/entities/OrgRoot.ts

@@ -1,6 +1,7 @@
 import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
 import { EntityBase } from "./base/Base";
 import { OrgChild1 } from "./OrgChild1";
+import { OrgRevision } from "./OrgRevision";
 
 // ENUM orgRootRank
 enum OrgRootRank {
@@ -75,7 +76,7 @@ export class OrgRoot extends EntityBase {
   @Column({
     nullable: true,
     comment: "สถานะของหน่วยงาน", //ปกติ = 1 , ยุกเลิก = 0
-    default: true,
+    default: false,
   })
   orgRootIsNormal: boolean;
 
@@ -90,12 +91,16 @@ export class OrgRoot extends EntityBase {
     default: "00000000-0000-0000-0000-000000000000",
   })
   isAncestorDNA: string;
-
+  
+  @ManyToOne(() => OrgRevision, orgRevision => orgRevision.orgRoots)
+  @JoinColumn({ name: "orgRevisionId" })
+  orgRevision: OrgRevision;
+  
   @OneToMany(() => OrgChild1, (orgChild1) => orgChild1.orgRoot)
   orgChild1s: OrgChild1[];
+
 }
 
-export type UpdateOrgRoot = Partial<OrgRoot>;
 
 export class CreateOrgRoot {
   @Column()
@@ -110,18 +115,19 @@ export class CreateOrgRoot {
   @Column()
   orgRootRank: OrgRootRank;
 
-  // @Column()
-  // orgRootOrder: number;
+  @Column()
+  orgRootPhoneEx?: string;
 
   @Column()
-  orgRootPhoneEx: string;
+  orgRootPhoneIn?: string;
 
   @Column()
-  orgRootPhoneIn: string;
+  orgRootFax?: string;
+  
+  @Column('uuid')
+  orgRevisionId: string;
 
-  @Column()
-  orgRootFax: string;
 
-  @Column()
-  orgRootIsNormal: boolean;
 }
+
+export type UpdateOrgRoot = Partial<CreateOrgRoot> & { orgRootRank?: OrgRootRank };