Fixed Null Safety error

This commit is contained in:
thomashii@dukefirehawk.com 2021-05-03 14:50:20 +08:00
parent 522f5215e0
commit 7644d8c2d2

View file

@ -143,13 +143,13 @@ class UserQuery extends Query<User?, UserQueryWhere?> {
@override @override
get(QueryExecutor executor) { get(QueryExecutor executor) {
return super.get(executor).then((result) { return super.get(executor).then((result) {
return result.fold<List<User?>>([], (out, model) { return result.fold<List<User>>([], (out, model) {
var idx = out.indexWhere((m) => m!.id == model!.id); var idx = out.indexWhere((m) => m.id == model!.id);
if (idx == -1) { if (idx == -1) {
return out..add(model); return out..add(model!);
} else { } else {
var l = out[idx]!; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles)..addAll(model!.roles)); roles: List<_Role>.from(l.roles)..addAll(model!.roles));
@ -161,13 +161,13 @@ class UserQuery extends Query<User?, UserQueryWhere?> {
@override @override
update(QueryExecutor executor) { update(QueryExecutor executor) {
return super.update(executor).then((result) { return super.update(executor).then((result) {
return result.fold<List<User?>>([], (out, model) { return result.fold<List<User>>([], (out, model) {
var idx = out.indexWhere((m) => m!.id == model!.id); var idx = out.indexWhere((m) => m.id == model!.id);
if (idx == -1) { if (idx == -1) {
return out..add(model); return out..add(model!);
} else { } else {
var l = out[idx]!; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles)..addAll(model!.roles)); roles: List<_Role>.from(l.roles)..addAll(model!.roles));
@ -179,13 +179,13 @@ class UserQuery extends Query<User?, UserQueryWhere?> {
@override @override
delete(QueryExecutor executor) { delete(QueryExecutor executor) {
return super.delete(executor).then((result) { return super.delete(executor).then((result) {
return result.fold<List<User?>>([], (out, model) { return result.fold<List<User>>([], (out, model) {
var idx = out.indexWhere((m) => m!.id == model!.id); var idx = out.indexWhere((m) => m.id == model!.id);
if (idx == -1) { if (idx == -1) {
return out..add(model); return out..add(model!);
} else { } else {
var l = out[idx]!; var l = out[idx];
return out return out
..[idx] = l.copyWith( ..[idx] = l.copyWith(
roles: List<_Role>.from(l.roles)..addAll(model!.roles)); roles: List<_Role>.from(l.roles)..addAll(model!.roles));