Merge branch 'develop' into lmm

src/app/components/incidentManagement/incident-substitution/incident-substitution.component.ts

@@ -139,6 +139,8 @@ export class IncidentSubstitutionComponent implements OnInit {
         delete postData.incident.assignee;
       }
 
+      postData.incident.candidateGroupId = this.assign.validateForm.value.groupId;
+
       this.mainService
       .flowPost("incident/task/redeploy", postData)
       .subscribe((result) => {
@@ -179,6 +181,7 @@ export class IncidentSubstitutionComponent implements OnInit {
         delete postData.incident.assignee;
       }
 
+      postData.incident.candidateGroupId = this.assign.validateForm.value.groupId;
       postData.incident.duty = { id: this.assign.validateForm.value.dutyId };
 
       this.mainService