Skip to content

Commit 67ec6fa

Browse files
author
VuXfi
committed
passing without worktime groups
1 parent afb0540 commit 67ec6fa

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

models/Group.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,11 @@ let Model = {
366366
groups = children;
367367
}
368368
}
369-
groups = groups.filter(group => worktime_1.WorkTimeValidator.isWorkNow({ worktime: group.worktime }).workNow);
369+
groups = groups.filter(group => {
370+
if (!group.worktime)
371+
return true;
372+
return worktime_1.WorkTimeValidator.isWorkNow({ worktime: group.worktime }).workNow;
373+
});
370374
return groups.sort((a, b) => a.sortOrder - b.sortOrder);
371375
},
372376
/**

models/Group.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,10 @@ let Model = {
446446
if(children) groups = children;
447447
}
448448
}
449-
groups = groups.filter(group =>
450-
WorkTimeValidator.isWorkNow({ worktime: group.worktime }).workNow
449+
groups = groups.filter(group => {
450+
if (!group.worktime) return true;
451+
return WorkTimeValidator.isWorkNow({ worktime: group.worktime }).workNow
452+
}
451453
);
452454
return groups.sort((a, b) => a.sortOrder - b.sortOrder);
453455
},

0 commit comments

Comments
 (0)