|
|
@@ -70,7 +70,7 @@ class Note
|
|
|
foreach ($data as $k => $v) {
|
|
|
$table = Dever::config('base')->type_table[$v['type']];
|
|
|
$info = Dever::db($table)->one($v['data_id']);
|
|
|
- if ($info && $v['type'] == 3 && isset($info['sdate']) && $info['sdate'] > 0 && $info['sdate'] > $time && $info['sdate'] - $time <= $date) {
|
|
|
+ if ($info && $v['type'] == 3 && isset($info['sdate']) && $info['sdate'] > 0 && (($info['sdate'] > $time && $info['sdate'] - $time <= $date) || $time > $info['sdate'])) {
|
|
|
|
|
|
$user = Dever::db('passport/user')->one($v['uid']);
|
|
|
if (!$user) {
|
dever