forked from wangziqi/gongxue-base
fix: revert untracked ExpenseType refs, fix findByUser falsy cursor check
This commit is contained in:
@@ -29,7 +29,6 @@ import {
|
|||||||
DingAttendanceRaw,
|
DingAttendanceRaw,
|
||||||
SyncLog,
|
SyncLog,
|
||||||
SyncState,
|
SyncState,
|
||||||
ExpenseType,
|
|
||||||
Notification,
|
Notification,
|
||||||
} from './entities';
|
} from './entities';
|
||||||
import { AuthModule } from './auth/auth.module';
|
import { AuthModule } from './auth/auth.module';
|
||||||
@@ -52,7 +51,6 @@ import { SchedulesModule } from './schedules/schedules.module';
|
|||||||
import { ClassroomRentalsModule } from './classroom-rentals/classroom-rentals.module';
|
import { ClassroomRentalsModule } from './classroom-rentals/classroom-rentals.module';
|
||||||
import { SyncModule } from './sync/sync.module';
|
import { SyncModule } from './sync/sync.module';
|
||||||
import { NotificationsModule } from './notifications/notifications.module';
|
import { NotificationsModule } from './notifications/notifications.module';
|
||||||
import { ExpenseTypesModule } from './expense-types/expense-types.module';
|
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -94,7 +92,6 @@ import { ExpenseTypesModule } from './expense-types/expense-types.module';
|
|||||||
DingAttendanceRaw,
|
DingAttendanceRaw,
|
||||||
SyncLog,
|
SyncLog,
|
||||||
SyncState,
|
SyncState,
|
||||||
ExpenseType,
|
|
||||||
Notification,
|
Notification,
|
||||||
];
|
];
|
||||||
if (dbType === 'mysql') {
|
if (dbType === 'mysql') {
|
||||||
@@ -135,7 +132,6 @@ import { ExpenseTypesModule } from './expense-types/expense-types.module';
|
|||||||
SchedulesModule,
|
SchedulesModule,
|
||||||
ClassroomRentalsModule,
|
ClassroomRentalsModule,
|
||||||
SyncModule,
|
SyncModule,
|
||||||
ExpenseTypesModule,
|
|
||||||
NotificationsModule,
|
NotificationsModule,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export class NotificationsService {
|
|||||||
.orderBy('n.createdAt', 'DESC')
|
.orderBy('n.createdAt', 'DESC')
|
||||||
.take(limit);
|
.take(limit);
|
||||||
|
|
||||||
if (after) {
|
if (after !== undefined) {
|
||||||
qb.andWhere('n.id < :after', { after });
|
qb.andWhere('n.id < :after', { after });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user