Browse Source

BUG修复

seimin 5 months ago
parent
commit
cb980a4a3d

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

@@ -277,8 +277,8 @@ export class IncidentManagementComponent implements OnInit {
277
       sum: this.pageSize,
277
       sum: this.pageSize,
278
       incident: {
278
       incident: {
279
         assignee: this.tool.getCurrentUserId(),
279
         assignee: this.tool.getCurrentUserId(),
280
-        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
281
-        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
280
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
281
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
282
         incidentsign: this.searchDTO.incidentsign,
282
         incidentsign: this.searchDTO.incidentsign,
283
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
283
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
284
         statusId: this.searchDTO.statusId || undefined,
284
         statusId: this.searchDTO.statusId || undefined,
@@ -561,8 +561,8 @@ export class IncidentManagementComponent implements OnInit {
561
       sum: 99999,
561
       sum: 99999,
562
       incident: {
562
       incident: {
563
         assignee: this.tool.getCurrentUserId(),
563
         assignee: this.tool.getCurrentUserId(),
564
-        acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
565
-        acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
564
+        acceptDate: (this.searchDTO.dateRange && this.searchDTO.dateRange[0]) ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
565
+        acceptDateEnd: (this.searchDTO.dateRange && this.searchDTO.dateRange[1]) ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
566
         incidentsign: this.searchDTO.incidentsign,
566
         incidentsign: this.searchDTO.incidentsign,
567
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
567
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
568
         statusId: this.searchDTO.statusId || undefined,
568
         statusId: this.searchDTO.statusId || undefined,