Merge branch 'master' into develop

src/app/views/incident-management/incident-management.component.ts

@@ -277,8 +277,8 @@ export class IncidentManagementComponent implements OnInit {
       sum: this.pageSize,
       incident: {
         assignee: this.tool.getCurrentUserId(),
-        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
-        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
         incidentsign: this.searchDTO.incidentsign,
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
         statusId: this.searchDTO.statusId || undefined,
@@ -561,8 +561,8 @@ export class IncidentManagementComponent implements OnInit {
       sum: 99999,
       incident: {
         assignee: this.tool.getCurrentUserId(),
-        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
-        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
         incidentsign: this.searchDTO.incidentsign,
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
         statusId: this.searchDTO.statusId || undefined,