diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index ff21f86..47dd85e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -18,7 +18,7 @@
                                 <!-- <mat-card-title> Step 1 : -Excel Upload </mat-card-title> -->
                             </mat-card-header>
                             
-                            <div fxLayoutAlign="flex-end" *ngIf="productname == 'NBFC/MFI' && role_id != '26' || role_id != '27'">
+                            <div fxLayoutAlign="flex-end" *ngIf="(productname == 'NBFC/MFI' && role_id != '26' && role_id != '27') || (productname != 'NBFC/MFI')">
                             <button [ngStyle.xs]="{'width':'100%'}" style="font-size: 1.5rem;width: 32%;" mat-raised-button color="primary" (click)="openExcelUploadModal()">
                                     Upload Excel <mat-icon>publish</mat-icon>
                             </button>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index a243e49..1fbac00 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -80,6 +80,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
   @ViewChild('applicant_details') applicant_details_element :ElementRef
   productname: any;
   role_id: any;
+  prod_seg: any;
   constructor(notifier: NotifierService, private _fb: FormBuilder, private route: ActivatedRoute,
     private router: Router, private _pd: PdTrigerService, private _aws: AwsService, private ListPdComponent: ListPdComponent,
     private titleCase : TitleCasePipe,private userService:UserService,private matDialog:MatDialog) {
@@ -348,8 +349,10 @@ export class AddPdComponent implements OnInit, OnDestroy {
     // console.log('productID',productID,productabbr);
       /**customer segment */
       this._PDtriggerForm.controls['fk_subproduct_id'].clearValidators()
+      //this._PDtriggerForm.controls['fk_customer_segment'].clearValidators()
       console.log(productabbr);
       console.log('test');
+      this.isCustomerSegmentShown=true;
       switch(productabbr){
         case 'WCTL' :
           // console.log(1);
@@ -382,6 +385,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
           // console.log(3);
           this.customerSegmentList = this.customerSegmentAllList;
           this.isSubproductShown = true;
+          
           this._PDtriggerForm.controls['fk_subproduct_id'].setValidators(Validators.required)
           break;
       }
@@ -584,6 +588,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
   }
   //trigger  pd 
   triggerPD(formValue: any, status: string) {
+    
     this._PDtriggerForm.controls['fk_lender_id'].setValidators([Validators.required]);
     this._PDtriggerForm.controls['fk_lender_id'].updateValueAndValidity();
     // console.log(formValue);
@@ -604,18 +609,23 @@ export class AddPdComponent implements OnInit, OnDestroy {
     //   this._PDtriggerForm.controls['fk_subproduct_id'].setValidators([Validators.required]);
     //   this._PDtriggerForm.controls['fk_subproduct_id'].updateValueAndValidity(); 
     // }
+    
     if(formValue.fk_product_id == '4'){
       this._PDtriggerForm.controls['fk_subproduct_id'].setValue(null);
     }
+    this.prod_seg = this.productAllList.filter(item => item.product_id == formValue.fk_product_id)[0].product_abbr;
+    
 
     if(this.lenderShortName != 'CLIX'){
 
-      // this._PDtriggerForm.controls['fk_pd_type'].setValidators([Validators.required]);
-      // this._PDtriggerForm.controls['fk_pd_type'].updateValueAndValidity();
-
+      
+      if(this.prod_seg!='NBFC/MFI')
+      {
+        
       this._PDtriggerForm.controls['fk_customer_segment'].setValidators([Validators.required]);
       this._PDtriggerForm.controls['fk_customer_segment'].updateValueAndValidity();
-    
+      }
+      
       this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required]);
       this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity();
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index e9ad22d..0fa9646 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -450,6 +450,7 @@ export class EditPdMasterComponent implements OnInit {
           }
          
           // console.log('this.productAbbr',this.productShortName);
+          this.isCustomerSegmentShown = true;
           switch (this.productShortName) {
             case 'BL':
                     //  console.log(1);
@@ -476,6 +477,7 @@ export class EditPdMasterComponent implements OnInit {
                       this.customerSegmentList = this.customerSegmentAllList;
                       // console.log('productID', productID);
                       this.isSubproductShown = true;
+                     
                       break;
           }
         }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index f027311..b8dee08 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -21,7 +21,8 @@
                     <mat-icon>videocam</mat-icon>&nbsp;
                     <strong>Call</strong>
                   </button>
-                <div *ngIf="product == 'NBFC/MFI' && LenderRoleID != '26' || LenderRoleID != '27'">
+                <div *ngIf="(product == 'NBFC/MFI' && LenderRoleID != '26' && LenderRoleID != '27') || (product != 'NBFC/MFI')">
+                  
                   <button  mat-stroked-button class="mr-1 mb-1"  color="primary" (click)="openExcelUpload()" *ngIf="master.lender_short_name == 'MWISE' &&(LenderRoleID == '25' || LenderRoleID == '26' || LenderRoleID == '27') && currentPDStatus!=pdStatusCheck.INPROGRESS && currentPDStatus!=pdStatusCheck.COMPLETED" >
                     <mat-icon>upload_file</mat-icon>&nbsp;
                   <strong>Upload Excel</strong>