|
@@ -630,7 +630,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
|
630
|
630
|
}
|
631
|
631
|
var postData = {
|
632
|
632
|
"idx": 0,
|
633
|
|
- "sum": 1000,
|
|
633
|
+ "sum": 9999,
|
634
|
634
|
"incidentcategory": {},
|
635
|
635
|
}
|
636
|
636
|
if (filterKeyword) {
|
|
@@ -878,11 +878,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
|
878
|
878
|
}
|
879
|
879
|
}
|
880
|
880
|
if($rootScope.user.duty){
|
881
|
|
- delete filuser.user.branchId
|
882
|
|
- filuser.user.dutyId = $rootScope.user.duty.id;
|
|
881
|
+ delete filuser.user.branch
|
|
882
|
+ filuser.user.duty = $rootScope.user.duty;
|
883
|
883
|
}else if($rootScope.user.branch){
|
884
|
|
- delete filuser.user.dutyId
|
885
|
|
- filuser.user.branchId = $rootScope.user.branch.id;
|
|
884
|
+ delete filuser.user.duty
|
|
885
|
+ filuser.user.branch = $rootScope.user.branch;
|
886
|
886
|
}
|
887
|
887
|
getUser(filuser, 1);
|
888
|
888
|
}
|
|
@@ -898,11 +898,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
|
898
|
898
|
}
|
899
|
899
|
}
|
900
|
900
|
if($rootScope.user.duty){
|
901
|
|
- delete filuser.user.branchId
|
902
|
|
- filuser.user.dutyId = $rootScope.user.duty.id;
|
|
901
|
+ delete filuser.user.branch
|
|
902
|
+ filuser.user.duty = $rootScope.user.duty;
|
903
|
903
|
}else if($rootScope.user.branch){
|
904
|
|
- delete filuser.user.dutyId
|
905
|
|
- filuser.user.branchId = $rootScope.user.branch.id;
|
|
904
|
+ delete filuser.user.duty
|
|
905
|
+ filuser.user.branch = $rootScope.user.branch;
|
906
|
906
|
}
|
907
|
907
|
getUser(filuser, 2);
|
908
|
908
|
}
|