690404:1139 Modify ADR

frontend/components/admin/user-dialog.tsx

@@ -107,7 +107,7 @@ export function UserDialog({ open, onOpenChange, user }: UserDialogProps) {
         lastName: user.lastName,
         isActive: user.isActive,
         lineId: user.lineId || '',
-        primaryOrganizationId: user.primaryOrganizationId?.toString() || ALL_ORGANIZATIONS_VALUE,
+        primaryOrganizationId: user.primaryOrganizationId || ALL_ORGANIZATIONS_VALUE,
         roleIds: user.roles?.map((r: { roleId?: number }) => r.roleId).filter((id): id is number => id !== undefined) || [],
         password: '',
         confirmPassword: '',

frontend/components/correspondences/form.tsx

@@ -77,15 +77,14 @@ interface DisciplineOption {
 }
 
 interface InitialCorrespondenceData {
-  projectId?: number | string;
+  projectId?: string;
   project?: { publicId?: string };
   contract?: { publicId?: string };
   correspondenceTypeId?: number;
-  type?: { id?: number; publicId?: string };
+  type?: { id?: number };
   disciplineId?: number;
   discipline?: {
     id?: number;
-    publicId?: string;
     contract?: { publicId?: string };
   };
   revisions?: Array<{
@@ -102,11 +101,11 @@ interface InitialCorrespondenceData {
     receivedDate?: string;
     details?: { importance: 'NORMAL' | 'HIGH' | 'URGENT' };
   }>;
-  originatorId?: number;
+  originatorId?: string;
   originator?: { publicId?: string };
   recipients?: Array<{
     recipientType: string;
-    recipientOrganizationId: number;
+    recipientOrganizationId?: string;
     recipientOrganization?: { publicId?: string };
   }>;
   correspondenceNumber?: string;

frontend/components/rfas/form.tsx

@@ -70,6 +70,7 @@ type RfaTypeOption = {
 };
 
 type CorrespondenceTypeOption = {
+  id: number; // Master data INT ID
   publicId: string; // ADR-019: public identifier
   typeCode?: string;
   typeName?: string;
@@ -272,8 +273,8 @@ export function RFAForm() {
       try {
         const res = await correspondenceService.previewNumber({
           projectId: selectedProjectId,
-          typeId: rfaCorrespondenceType.publicId,
-          disciplineId,
+          typeId: rfaCorrespondenceType.id,
+          disciplineId: Number(disciplineId || 0),
           recipients: [{ organizationId: toOrganizationId, type: 'TO' }],
           subject: watch('subject') || 'Preview Subject',
         });