bugfix

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts

@@ -109,7 +109,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -174,7 +174,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -109,7 +109,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -172,7 +172,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -122,7 +122,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       categoryId: this.category2Id || this.category1Id || undefined,
       hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -189,7 +189,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       categoryId: this.category2Id || this.category1Id || undefined,
       hierarchy: this.category2Id ? 2 : (this.category1Id ? 1 : undefined),
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts

@@ -121,7 +121,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       categoryId: this.category1Id || undefined,
       hierarchy: this.category1Id ? 1 : undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,
@@ -188,7 +188,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       categoryId: this.category1Id || undefined,
       hierarchy: this.category1Id ? 1 : undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
       companyId: this.fieldConfig.fields.companyId || undefined,

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -120,7 +120,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -185,7 +185,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -112,7 +112,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       parentDutyId: this.parentDutyId || undefined,
       deptTypeId: this.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -176,7 +176,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       parentDutyId: this.parentDutyId || undefined,
       deptTypeId: this.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -112,7 +112,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       parentDutyId: this.parentDutyId || undefined,
       deptTypeId: this.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -176,7 +176,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       parentDutyId: this.parentDutyId || undefined,
       deptTypeId: this.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -112,7 +112,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       parentDutyId: this.parentDutyId || undefined,
       deptTypeId: this.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -176,7 +176,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       parentDutyId: this.parentDutyId || undefined,
       deptTypeId: this.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -120,7 +120,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       sourceId: this.fieldConfig.fields.sourceId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
@@ -184,7 +184,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       sourceId: this.fieldConfig.fields.sourceId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,

src/app/views/new-statistics/maintenance-statistics/work-hour-statistics/work-hour-statistics.component.ts

@@ -120,7 +120,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,
@@ -185,7 +185,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
       parentDutyId: this.parentDutyId || undefined,
       repairDeptId: this.repairDeptId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
-      userId: this.fieldConfig.fields.userId || undefined,
+      userId: this.fieldConfig.fields.groupId ? (this.fieldConfig.fields.userId || undefined) : undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       placeId: this.fieldConfig.fields.floorId || undefined,